diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 11:55:14 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 11:27:18 +0000 |
commit | efa9e6fe9a3d152ff73fb2afaa80c5693283742c (patch) | |
tree | e91417705f43d97f495e5fc8f9f43c244a9619c1 /src/quick | |
parent | 6cc908e25b9ecdd364cd008a59429273c39844a2 (diff) |
Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses.
Task-number: QTBUG-51673
Change-Id: I33ab74f0c2ce9086c3610c5fa727f281197b6b55
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/quick.pro | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 90ba867ea8..f74a554aa9 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -11,7 +11,7 @@ no_network { DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -win32:!wince:!winrt: LIBS += -luser32 +win32:!winrt: LIBS += -luser32 exists("qqml_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors @@ -32,7 +32,7 @@ ANDROID_BUNDLED_FILES += \ include(util/util.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) -!wince:include(designer/designer.pri) +include(designer/designer.pri) contains(QT_CONFIG, accessibility) { include(accessible/accessible.pri) } diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index cd0f77799b..1b0b1acc0e 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -253,13 +253,13 @@ void QSGRenderLoop::handleContextCreationFailure(QQuickWindow *window, const bool signalEmitted = QQuickWindowPrivate::get(window)->emitError(QQuickWindow::ContextNotAvailable, translatedMessage); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) if (!signalEmitted && !QLibraryInfo::isDebugBuild() && !GetConsoleWindow()) { MessageBox(0, (LPCTSTR) translatedMessage.utf16(), (LPCTSTR)(QCoreApplication::applicationName().utf16()), MB_OK | MB_ICONERROR); } -#endif // Q_OS_WIN && !Q_OS_WINCE && !Q_OS_WINRT +#endif // Q_OS_WIN && !Q_OS_WINRT if (!signalEmitted) qFatal("%s", qPrintable(untranslatedMessage)); } |