diff options
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/.prev_CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/qml/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4compilationunitmapper_win.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml.pro | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 11 | ||||
-rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 6 |
8 files changed, 26 insertions, 61 deletions
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 { |