From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 5 Jun 2020 09:24:37 +0200 Subject: Remove winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø --- src/gui/.prev_CMakeLists.txt | 8 ++------ src/gui/CMakeLists.txt | 12 +++--------- src/gui/accessible/accessible.pri | 2 +- src/gui/configure.cmake | 6 +++--- src/gui/configure.json | 6 +++--- src/gui/configure.pri | 1 - src/gui/image/image.pri | 2 +- src/gui/kernel/qclipboard.cpp | 11 ----------- src/gui/kernel/qguiapplication.cpp | 4 ++-- src/gui/painting/qpaintengine_raster.cpp | 4 ---- src/gui/rhi/qrhid3d11.cpp | 4 ---- 11 files changed, 15 insertions(+), 45 deletions(-) (limited to 'src/gui') diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index b9b2076af5..6670408378 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -300,6 +300,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_animation qt_extend_target(Gui CONDITION WIN32 SOURCES + image/qpixmap_win.cpp kernel/qwindowdefs_win.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h rhi/qrhid3d11_p_p.h @@ -364,7 +365,7 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility ${FWFoundation} ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 AND NOT WINRT +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 SOURCES accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h accessible/windows/apisupport/uiaattributeids_p.h @@ -406,11 +407,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_movie image/qmovie.cpp image/qmovie.h ) -qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT - SOURCES - image/qpixmap_win.cpp -) - qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index af144a2e24..3c844c7f51 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -13,9 +13,7 @@ qt_find_package(WrapPNG PROVIDED_TARGETS WrapPNG::WrapPNG) qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) if (QT_FEATURE_gui) - if (WINRT) - set(_default_platform "winrt") - elseif(WIN32) + if(WIN32) set(_default_platform "windows") elseif(ANDROID) set(_default_platform "android") @@ -392,6 +390,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_animation qt_extend_target(Gui CONDITION WIN32 SOURCES + image/qpixmap_win.cpp kernel/qwindowdefs_win.h rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h rhi/qrhid3d11_p_p.h @@ -457,7 +456,7 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility ${FWFoundation} ) -qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 AND NOT WINRT +qt_extend_target(Gui CONDITION QT_FEATURE_accessibility AND WIN32 SOURCES accessible/windows/apisupport/qwindowsuiawrapper.cpp accessible/windows/apisupport/qwindowsuiawrapper_p.h accessible/windows/apisupport/uiaattributeids_p.h @@ -499,11 +498,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_movie image/qmovie.cpp image/qmovie.h ) -qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT - SOURCES - image/qpixmap_win.cpp -) - qt_extend_target(Gui CONDITION QT_FEATURE_png SOURCES image/qpnghandler.cpp image/qpnghandler_p.h diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 7a376d98a2..471e2fbaea 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -24,5 +24,5 @@ qtConfig(accessibility) { LIBS_PRIVATE += -framework Foundation } - win32:!winrt: include(windows/windows.pri) + win32: include(windows/windows.pri) } diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index e844a603ac..9ee5089f49 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -569,7 +569,7 @@ qt_feature("directwrite2" PRIVATE ) qt_feature("direct2d" PRIVATE LABEL "Direct 2D" - CONDITION WIN32 AND NOT WINRT AND libs.d2d1 OR FIXME + CONDITION WIN32 AND libs.d2d1 OR FIXME ) qt_feature("direct2d1_1" PRIVATE LABEL "Direct 2D 1.1" @@ -692,13 +692,13 @@ qt_feature("opengles32" PUBLIC qt_feature("opengl-desktop" LABEL "Desktop OpenGL" AUTODETECT NOT WIN32 - CONDITION ( WIN32 AND NOT WINRT AND ( MSVC OR OpenGL_FOUND ) ) OR ( NOT WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_FOUND ) + CONDITION ( WIN32 AND ( MSVC OR OpenGL_FOUND ) ) OR ( NOT WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_FOUND ) ENABLE INPUT_opengl STREQUAL 'desktop' DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) qt_feature("opengl-dynamic" LABEL "Dynamic OpenGL" - CONDITION WIN32 AND NOT WINRT + CONDITION WIN32 DISABLE INPUT_opengl STREQUAL 'no' OR INPUT_opengl STREQUAL 'desktop' ) qt_feature("dynamicgl" PUBLIC diff --git a/src/gui/configure.json b/src/gui/configure.json index f770ee7729..377865679d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1069,7 +1069,7 @@ }, "direct2d": { "label": "Direct 2D", - "condition": "config.win32 && !config.winrt && libs.d2d1", + "condition": "config.win32 && libs.d2d1", "output": [ "privateFeature" ] }, "direct2d1_1": { @@ -1224,12 +1224,12 @@ "autoDetect": "!config.win32", "enable": "input.opengl == 'desktop'", "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'", - "condition": "(config.win32 && !config.winrt && (config.msvc || libs.opengl)) || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)" + "condition": "(config.win32 && (config.msvc || libs.opengl)) || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)" }, "opengl-dynamic": { "label": "Dynamic OpenGL", "disable": "input.opengl == 'no' || input.opengl == 'desktop'", - "condition": "config.win32 && !config.winrt", + "condition": "config.win32", "output": [ { "type": "publicFeature", "name": "dynamicgl" }, { "type": "define", "name": "QT_OPENGL_DYNAMIC" } diff --git a/src/gui/configure.pri b/src/gui/configure.pri index 490ef0df28..667ccf53e2 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -60,7 +60,6 @@ defineTest(qtConfTest_qpaDefaultPlatform) { name = !isEmpty(config.input.qpa_default_platform): name = $$config.input.qpa_default_platform else: !isEmpty(QT_QPA_DEFAULT_PLATFORM): name = $$QT_QPA_DEFAULT_PLATFORM - else: winrt: name = winrt else: win32: name = windows else: android: name = android else: macos: name = cocoa diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index c1cd798490..bf0aa519a8 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -55,7 +55,7 @@ qtConfig(movie) { SOURCES += image/qmovie.cpp } -win32:!winrt: SOURCES += image/qpixmap_win.cpp +win32: SOURCES += image/qpixmap_win.cpp darwin: OBJECTIVE_SOURCES += image/qimage_darwin.mm diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 3b42e78624..79a2caea69 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -137,17 +137,6 @@ QT_BEGIN_NAMESPACE \endlist - \section1 Notes for Universal Windows Platform Users - - \list - - \li The Universal Windows Platform only allows to query the - clipboard in case the application is active and an application - window has focus. Accessing the clipboard data when in background - will fail due to access denial. - - \endlist - \sa QGuiApplication */ diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index c6facb8ceb..cde21dc8dd 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1256,12 +1256,12 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString if (!availablePlugins.isEmpty()) fatalMessage += QStringLiteral("\nAvailable platform plugins are: %1.\n").arg(availablePlugins.join(QLatin1String(", "))); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) // Windows: Display message box unless it is a console application // or debug build showing an assert box. if (!QLibraryInfo::isDebugBuild() && !GetConsoleWindow()) MessageBox(0, (LPCTSTR)fatalMessage.utf16(), (LPCTSTR)(QCoreApplication::applicationName().utf16()), MB_OK | MB_ICONERROR); -#endif // Q_OS_WIN && !Q_OS_WINRT +#endif // Q_OS_WIN qFatal("%s", qPrintable(fatalMessage)); return; diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 24e0289c53..65315ed7cb 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -158,9 +158,6 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; static inline bool winClearTypeFontsEnabled() { -#ifdef Q_OS_WINRT - return false; -#else // Q_OS_WINRT UINT result = 0; #if !defined(SPI_GETFONTSMOOTHINGTYPE) // MinGW # define SPI_GETFONTSMOOTHINGTYPE 0x200A @@ -168,7 +165,6 @@ static inline bool winClearTypeFontsEnabled() #endif SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0); return result == FE_FONTSMOOTHINGCLEARTYPE; -#endif // !Q_OS_WINRT } /*! diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp index 5b7ad10a2f..c284e17f46 100644 --- a/src/gui/rhi/qrhid3d11.cpp +++ b/src/gui/rhi/qrhid3d11.cpp @@ -147,11 +147,7 @@ QRhiD3D11::QRhiD3D11(QRhiD3D11InitParams *params, QRhiD3D11NativeHandles *import static QString comErrorMessage(HRESULT hr) { -#ifndef Q_OS_WINRT const _com_error comError(hr); -#else - const _com_error comError(hr, nullptr); -#endif QString result = QLatin1String("Error 0x") + QString::number(ulong(hr), 16); if (const wchar_t *msg = comError.ErrorMessage()) result += QLatin1String(": ") + QString::fromWCharArray(msg); -- cgit v1.2.3