Mercurial > trustbridge
comparison ui/main.cpp @ 369:78eec57bc133
merged.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Tue, 15 Apr 2014 09:44:54 +0200 |
parents | 75f7288ad67b |
children | 17e1c8f37d72 |
comparison
equal
deleted
inserted
replaced
368:f9c98f9e9f76 | 369:78eec57bc133 |
---|---|
44 QApplication::setOrganizationName(QString::fromLatin1(ORGANIZATION)); | 44 QApplication::setOrganizationName(QString::fromLatin1(ORGANIZATION)); |
45 QApplication::setApplicationName(QString::fromLatin1(APPNAME)); | 45 QApplication::setApplicationName(QString::fromLatin1(APPNAME)); |
46 QApplication::setApplicationVersion(QString::fromLatin1(VERSION)); | 46 QApplication::setApplicationVersion(QString::fromLatin1(VERSION)); |
47 QSettings::setDefaultFormat(QSettings::IniFormat); | 47 QSettings::setDefaultFormat(QSettings::IniFormat); |
48 | 48 |
49 MainWindow mainWin; | 49 MainWindow mainWin(trayMode); |
50 if (!trayMode) { | |
51 mainWin.show(); | |
52 } | |
53 | 50 |
54 return app.exec(); | 51 return app.exec(); |
55 } | 52 } |