diff options
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quick/quick.pro | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index ad559cbf0b..5a794c0dfb 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -317,7 +317,7 @@ qt_extend_target(Quick CONDITION MSVC #### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT +qt_extend_target(Quick CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 77517a45e0..f7a5b81a2a 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -14,7 +14,7 @@ CONFIG += qt_tracepoints DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -win32:!winrt: LIBS += -luser32 +win32: LIBS += -luser32 DEFINES += QT_NO_FOREACH diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 9306d3351a..6dd700630c 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -335,13 +335,13 @@ void QSGRenderLoop::handleContextCreationFailure(QQuickWindow *window) const bool signalEmitted = QQuickWindowPrivate::get(window)->emitError(QQuickWindow::ContextNotAvailable, translatedMessage); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) if (!signalEmitted && !QLibraryInfo::isDebugBuild() && !GetConsoleWindow()) { MessageBox(0, (LPCTSTR) translatedMessage.utf16(), (LPCTSTR)(QCoreApplication::applicationName().utf16()), MB_OK | MB_ICONERROR); } -#endif // Q_OS_WIN && !Q_OS_WINRT +#endif // Q_OS_WIN if (!signalEmitted) qFatal("%s", qPrintable(untranslatedMessage)); } |