diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
| commit | 4a1846acd122af58c601f9832ade4c4d8986e66a (patch) | |
| tree | 019b131bf411ba3c7e62fcff0199bdf073825fa2 /tools/qml/main.cpp | |
| parent | 3c63ac03ed262b59962b45ac974b82edc7c83880 (diff) | |
| parent | 27bee8076f50a948ffb9997e2a0673854681437d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tools/qml/main.cpp
Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
Diffstat (limited to 'tools/qml/main.cpp')
| -rw-r--r-- | tools/qml/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index c2718de240..90d2a940a3 100644 --- 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) { |