Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-11 10:09:58 +01:00
commit 4c5de7f9b7

View file

@ -38,6 +38,8 @@
int main(sint32 argc, char **argv) int main(sint32 argc, char **argv)
{ {
NLMISC::CApplicationContext applicationContext;
QApplication app(argc, argv); QApplication app(argc, argv);
QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png")); QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png"));