Remove winrt

Task-number: QTBUG-84434
Change-Id: If8f57f00726868a3540c877d07fca761618e4f08
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Maurice Kalinowski <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>

19 files changed, 35 insertions, 204 deletions

diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
index be1f6d842c..99f65f6200 100644
--- a/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
+++ b/examples/quick/rendercontrol/rendercontrol_d3d11/engine.cpp
@@ -63,11 +63,7 @@ Engine::~Engine()
 
 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);
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index 9a12e65eeb..ac8aacb727 100644
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -11,8 +11,7 @@ HEADERS += $$PWD/wtf/FilePrintStream.h
 
 HEADERS += $$PWD/wtf/RawPointer.h
 
-winrt: SOURCES += $$PWD/wtf/OSAllocatorWinRT.cpp
-else:win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp
+win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp
 else:integrity: SOURCES += $$PWD/wtf/OSAllocatorIntegrity.cpp
 else: SOURCES += $$PWD/wtf/OSAllocatorPosix.cpp
 HEADERS += $$PWD/wtf/OSAllocator.h
diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
deleted file mode 100644
index 4cebc35cce..0000000000
--- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "OSAllocator.h"
-#include "PageBlock.h"
-
-#if OS(WINRT)
-
-#include "windows.h"
-#include <wtf/Assertions.h>
-
-// Try to use JIT by default and fallback to non-JIT on first error
-static bool qt_winrt_use_jit = true;
-
-namespace WTF {
-
-inline size_t getPageSize()
-{
-    SYSTEM_INFO info;
-    GetNativeSystemInfo(&info);
-    return info.dwPageSize;
-}
-
-static inline DWORD protection(bool writable, bool executable)
-{
-    if (writable && executable)
-        qFatal("read/write executable areas are not allowed on WinRT");
-    return executable ?
-                (writable ? PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_READ) :
-                (writable ? PAGE_READWRITE : PAGE_READONLY);
-}
-
-void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool writable, bool executable)
-{
-    void *result = VirtualAllocFromApp(0, bytes, MEM_RESERVE, protection(writable, executable));
-    return result;
-}
-
-void* OSAllocator::reserveAndCommit(size_t bytes, Usage, bool writable, bool executable, bool includesGuardPages)
-{
-    void *result;
-    result = VirtualAllocFromApp(0, bytes, MEM_RESERVE | MEM_COMMIT,
-                                 protection(writable, executable));
-
-    if (includesGuardPages && qt_winrt_use_jit) {
-        size_t guardSize = pageSize();
-        DWORD oldProtect;
-        if (!VirtualProtectFromApp(result, guardSize, protection(false, false), &oldProtect) ||
-            !VirtualProtectFromApp(static_cast<char*>(result) + bytes - guardSize, guardSize,
-                                   protection(false, false), &oldProtect)) {
-            CRASH();
-        }
-    }
-    return result;
-}
-
-void OSAllocator::commit(void *bytes, size_t size, bool writable, bool executable)
-{
-    void *result = VirtualAllocFromApp(bytes, size, MEM_COMMIT,
-                                       protection(writable, executable));
-    if (!result)
-        CRASH();
-}
-
-void OSAllocator::decommit(void* address, size_t bytes)
-{
-    bool result = VirtualFree(address, bytes, MEM_DECOMMIT);
-    if (!result)
-        CRASH();
-}
-
-void OSAllocator::releaseDecommitted(void* address, size_t)
-{
-    bool result = VirtualFree(address, 0, MEM_RELEASE);
-    if (!result)
-        CRASH();
-}
-
-bool OSAllocator::canAllocateExecutableMemory()
-{
-    if (qt_winrt_use_jit) {
-        // For WinRT we first check if code generation is enabled. If successful
-        // we allow to use JIT, otherwise fallback to the interpreter
-        const size_t pageSize = getPageSize();
-        void *all = VirtualAllocFromApp(0, pageSize, MEM_RESERVE | MEM_COMMIT,
-                                        protection(true, false));
-        DWORD oldProtect;
-        bool res = VirtualProtectFromApp(all, pageSize, PAGE_EXECUTE, &oldProtect);
-        VirtualFree(all, 0, MEM_RELEASE);
-        if (!res) {
-            qt_winrt_use_jit = false;
-            qWarning("Could not enable JIT, fallback to interpreter mode. "
-                     "Consider setting the code-generation capability");
-        }
-    }
-    return qt_winrt_use_jit;
-}
-
-
-} // namespace WTF
-
-#endif // OS(WINRT)
diff --git a/src/imports/layouts/qquicklayoutstyleinfo.cpp b/src/imports/layouts/qquicklayoutstyleinfo.cpp
index 5c8be8f306..1632c1ce20 100644
--- a/src/imports/layouts/qquicklayoutstyleinfo.cpp
+++ b/src/imports/layouts/qquicklayoutstyleinfo.cpp
@@ -50,7 +50,7 @@ QQuickLayoutStyleInfo::QQuickLayoutStyleInfo()
 
 qreal QQuickLayoutStyleInfo::spacing(Qt::Orientation /*orientation*/) const
 {
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_QNX)
     // On Android and iOS the default spacing between each UI element is 8dp
     qreal spacing = 8.0;
 #else
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index e71d9abaa0..139e6b1f9f 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -356,9 +356,12 @@ qt_extend_target(Qml CONDITION MSVC
         _CRT_SECURE_NO_WARNINGS
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
+        jsruntime/qv4compilationunitmapper_win.cpp
+    DEFINES
+        NOMINMAX
     PUBLIC_LIBRARIES
         shell32
 )
@@ -464,19 +467,12 @@ qt_extend_target(Qml CONDITION UNIX
         jsruntime/qv4functiontable_unix.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32
-    SOURCES
-        jsruntime/qv4compilationunitmapper_win.cpp
-    DEFINES
-        NOMINMAX
-)
-
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
@@ -554,17 +550,12 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN
 #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-qt_extend_target(Qml CONDITION WINRT
-    SOURCES
-        ../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
-)
-
 qt_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
@@ -580,7 +571,7 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
         ../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
 )
 
-#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
+#### Keys ignored in scope 72:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
 # ITAB = "$$PWD/disassembler/udis86/optable.xml"
 # QMAKE_EXTRA_COMPILERS = "udis86"
 # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
@@ -591,10 +582,10 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 # udis86_tab_cfile.depends = "udis86_itab.h"
 # udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c"
 
-#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
 # GENERATEDDIR = "$$GENERATEDDIR/debug"
 
-#### Keys ignored in scope 77:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
+#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
 qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 527a5f4914..5e4dfb8561 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -363,9 +363,12 @@ qt_extend_target(Qml CONDITION MSVC
         _CRT_SECURE_NO_WARNINGS
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorWin.cpp
+        jsruntime/qv4compilationunitmapper_win.cpp
+    DEFINES
+        NOMINMAX
     PUBLIC_LIBRARIES
         shell32
 )
@@ -471,19 +474,12 @@ qt_extend_target(Qml CONDITION UNIX
         jsruntime/qv4functiontable_unix.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32
-    SOURCES
-        jsruntime/qv4compilationunitmapper_win.cpp
-    DEFINES
-        NOMINMAX
-)
-
-qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32
     SOURCES
         jsruntime/qv4functiontable_win64.cpp
 )
 
-qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND NOT (TEST_architecture_arch STREQUAL "x86_64")
     SOURCES
         jsruntime/qv4functiontable_noop.cpp
 )
@@ -561,17 +557,12 @@ qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AN
 #### Keys ignored in scope 66:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
 # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
 
-qt_extend_target(Qml CONDITION WINRT
-    SOURCES
-        ../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
-)
-
 qt_extend_target(Qml CONDITION INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
 )
 
-qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY
     SOURCES
         ../3rdparty/masm/wtf/OSAllocatorPosix.cpp
 )
@@ -587,7 +578,7 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
         ../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c
 )
 
-#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
+#### Keys ignored in scope 72:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1:
 # ITAB = "$$PWD/disassembler/udis86/optable.xml"
 # QMAKE_EXTRA_COMPILERS = "udis86"
 # QMAKE_EXTRA_TARGETS = "udis86_tab_cfile"
@@ -598,10 +589,10 @@ qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
 # udis86_tab_cfile.depends = "udis86_itab.h"
 # udis86_tab_cfile.target = "$$OUT_PWD/udis86_itab.c"
 
-#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+#### Keys ignored in scope 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
 # GENERATEDDIR = "$$GENERATEDDIR/debug"
 
-#### Keys ignored in scope 77:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
+#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
 # GENERATEDDIR = "$$GENERATEDDIR/release"
 
 qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 00127e1ca8..39391be976 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -157,7 +157,7 @@ unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp
 else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp
 
 win32 {
-    !winrt:equals(QT_ARCH, x86_64) {
+    equals(QT_ARCH, x86_64) {
         SOURCES += \
             $$PWD/qv4functiontable_win64.cpp
     } else {
diff --git a/src/qml/jsruntime/qv4compilationunitmapper_win.cpp b/src/qml/jsruntime/qv4compilationunitmapper_win.cpp
index 9e8babc5e6..b4f0a6ff4d 100644
--- a/src/qml/jsruntime/qv4compilationunitmapper_win.cpp
+++ b/src/qml/jsruntime/qv4compilationunitmapper_win.cpp
@@ -56,16 +56,10 @@ CompiledData::Unit *CompilationUnitMapper::open(const QString &cacheFileName, co
     // ### TODO: fix up file encoding/normalization/unc handling once QFileSystemEntry
     // is exported from QtCore.
     HANDLE handle =
-#if defined(Q_OS_WINRT)
-        CreateFile2(reinterpret_cast<const wchar_t*>(cacheFileName.constData()),
-                   GENERIC_READ | GENERIC_EXECUTE, FILE_SHARE_READ,
-                   OPEN_EXISTING, nullptr);
-#else
         CreateFile(reinterpret_cast<const wchar_t*>(cacheFileName.constData()),
                    GENERIC_READ | GENERIC_EXECUTE, FILE_SHARE_READ,
                    nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
                    nullptr);
-#endif
     if (handle == INVALID_HANDLE_VALUE) {
         *errorString = qt_error_string(GetLastError());
         return nullptr;
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 14b46307aa..0ef8f9e928 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -14,7 +14,7 @@ DEFINES   += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
 
 msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
 msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS
-win32:!winrt:LIBS += -lshell32
+win32:LIBS += -lshell32
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
 # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index fec4f2ba65..0692124dfe 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -91,9 +91,7 @@
 
 #ifdef Q_OS_WIN // for %APPDATA%
 #  include <qt_windows.h>
-#  ifndef Q_OS_WINRT
-#    include <shlobj.h>
-#  endif
+#  include <shlobj.h>
 #  include <qlibrary.h>
 #  ifndef CSIDL_APPDATA
 #    define CSIDL_APPDATA           0x001a  // <username>\Application Data
@@ -390,7 +388,6 @@ The following functions are also on the Qt object.
         \li \c "qnx" - QNX (since Qt 5.9.3)
         \li \c "unix" - Other Unix-based OS
         \li \c "windows" - Windows
-        \li \c "winrt" - WinRT / UWP
         \li \c "wasm" - WebAssembly
     \endlist
 
@@ -2506,7 +2503,7 @@ bool QQmlEnginePrivate::isScriptLoaded(const QUrl &url) const
     return typeLoader.isScriptLoaded(url);
 }
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if defined(Q_OS_WIN)
 // Normalize a file name using Shell API. As opposed to converting it
 // to a short 8.3 name and back, this also works for drives where 8.3 notation
 // is disabled (see 8dot3name options of fsutil.exe).
@@ -2538,7 +2535,7 @@ static inline QString shellNormalizeFileName(const QString &name)
         canonicalName[0] = canonicalName.at(0).toUpper();
     return QDir::cleanPath(canonicalName);
 }
-#endif // Q_OS_WIN && !Q_OS_WINRT
+#endif // Q_OS_WIN
 
 bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
 {
@@ -2546,7 +2543,7 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
     QFileInfo info(fileName);
     const QString absolute = info.absoluteFilePath();
 
-#if defined(Q_OS_DARWIN) || defined(Q_OS_WINRT)
+#if defined(Q_OS_DARWIN)
     const QString canonical = info.canonicalFilePath();
 #elif defined(Q_OS_WIN)
     // No difference if the path is qrc based
diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp
index dcd7ca2d46..077b9f0698 100644
--- a/src/qml/qml/qqmlplatform.cpp
+++ b/src/qml/qml/qqmlplatform.cpp
@@ -66,8 +66,6 @@ QString QQmlPlatform::os()
     return QStringLiteral("tvos");
 #elif defined(Q_OS_MAC)
     return QStringLiteral("osx");
-#elif defined(Q_OS_WINRT)
-    return QStringLiteral("winrt");
 #elif defined(Q_OS_WIN)
     return QStringLiteral("windows");
 #elif defined(Q_OS_LINUX)
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 856dda1663..9af7e539e3 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -672,9 +672,6 @@ QRectF QQmlVMEMetaObject::readPropertyAsRectF(int id) const
     return v->d()->data().value<QRectF>();
 }
 
-#if defined(Q_OS_WINRT) && defined(_M_ARM)
-#pragma optimize("", off)
-#endif
 int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void **a)
 {
     Q_ASSERT(o == object);
@@ -1049,9 +1046,6 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
     else
         return object->qt_metacall(c, _id, a);
 }
-#if defined(Q_OS_WINRT) && defined(_M_ARM)
-#pragma optimize("", on)
-#endif
 
 QV4::ReturnedValue QQmlVMEMetaObject::method(int index) const
 {
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 63e51fa4ba..e7c5f61fb4 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -457,7 +457,7 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch
     }
 #endif
 
-#if defined(Q_OS_ANDROID) || defined(Q_OS_WINRT)
+#if defined(Q_OS_ANDROID)
     if (testPath.isEmpty())
         testPath = QLatin1String(":/");
 #endif
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));
 }
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 0964d6492e..6bcbb0722c 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -917,10 +917,10 @@ void QQuickWidgetPrivate::handleContextCreationFailure(const QSurfaceFormat &for
     if (signalConnected)
         emit q->sceneGraphError(QQuickWindow::ContextNotAvailable, translatedMessage);
 
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+#if defined(Q_OS_WIN)
     if (!signalConnected && !QLibraryInfo::isDebugBuild() && !GetConsoleWindow())
         QMessageBox::critical(q, QCoreApplication::applicationName(), translatedMessage);
-#endif // Q_OS_WIN && !Q_OS_WINRT
+#endif // Q_OS_WIN
     if (!signalConnected)
         qFatal("%s", qPrintable(untranslatedMessage));
 }
diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
index da33a46c68..6d08054250 100644
--- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
+++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
@@ -50,9 +50,6 @@
 #ifdef Q_OS_WIN
 # include <qt_windows.h>
 # include <time.h>
-#  if defined(Q_OS_WINRT)
-#    define tzset()
-#  endif
 #endif
 
 class tst_qqmlqt : public QQmlDataTest
diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index dccd3951b3..7116e1db49 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -66,7 +66,6 @@ private slots:
     void refresh();
     void cdUp();
 #ifdef Q_OS_WIN32
-    // WinCE/WinRT do not have drive APIs, so let's execute this test only on desktop Windows.
     void changeDrive();
 #endif
     void showDotAndDotDot();