From 1bee1eb0f80ca099945e60c113d24f7fa1e0ef29 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 12 Apr 2017 15:45:18 +0200 Subject: Fix forced error warnings in -no-gui build compiling main.cpp main.cpp:361:23: error: unused parameter argc [-Werror=unused-parameter] void getAppFlags(int &argc, char **argv) ^ main.cpp:361:36: error: unused parameter argv [-Werror=unused-parameter] void getAppFlags(int &argc, char **argv) ^ main.cpp:74:12: error: exitTimerId defined but not used [-Werror=unused-variable] static int exitTimerId = -1; ^ Change-Id: I3eb7aff4ab3b5f1e89fdbf6d090107efedb376dd Reviewed-by: Simon Hausmann --- tools/qml/main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 03d952ee98..9b5fcc74c2 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(app)->startTimer(FILE_OPEN_EVENT_WAIT_TIME); else -- cgit v1.2.3