diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:24 +0200 |
| commit | 0aaca005c0bb6267ddd14a84634c33c813e2d2c4 (patch) | |
| tree | 2c09a2498618830b32e92f13450fab2210aae446 /tools | |
| parent | 186cbe30939947e3a2d33b250fc861cbee361dfe (diff) | |
| parent | 749a7212e903d8e8c6f256edb1836b9449cc7fe1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ibed6ee74d36b4ce37391c82db00a0abd30d09e7a
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 3b20fba5d4..83680a5ba1 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -71,7 +71,9 @@ static Config *conf = 0; static QQmlApplicationEngine *qae = 0; +#if defined(Q_OS_DARWIN) || defined(QT_GUI_LIB) static int exitTimerId = -1; +#endif bool verboseMode = false; static void loadConf(const QString &override, bool quiet) // Terminates app on failure @@ -388,6 +390,9 @@ void getAppFlags(int &argc, char **argv) argc -= 2; } } +#else + Q_UNUSED(argc) + Q_UNUSED(argv) #endif // QT_GUI_LIB } @@ -552,7 +557,7 @@ int main(int argc, char *argv[]) qInstallMessageHandler(quietMessageHandler); if (files.count() <= 0) { -#if defined(Q_OS_MAC) +#if defined(Q_OS_DARWIN) if (applicationType == QmlApplicationTypeGui) exitTimerId = static_cast<LoaderApplication *>(app)->startTimer(FILE_OPEN_EVENT_WAIT_TIME); else |