Merge remote-tracking branch 'origin/5.5' into 5.6

[platform/upstream/qtdeclarative.git] / tools / qml / main.cpp

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index c2718de..90d2a94 100644 (file)
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -238,7 +238,7 @@ void LoadWatcher::checkForWindow(QObject *o)
     }
 #else
     Q_UNUSED(o)
-#endif // QT_GUI_LIB
+#endif // QT_GUI_LIB && !QT_NO_OPENGL
 }
 
 #if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL)
@@ -257,7 +257,7 @@ void LoadWatcher::onOpenGlContextCreated(QOpenGLContext *context)
     puts(output.constData());
     context->doneCurrent();
 }
-#endif // QT_GUI_LIB
+#endif // QT_GUI_LIB && !QT_NO_OPENGL
 
 void quietMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, const QString &msg)
 {