diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-02 13:57:39 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-04 15:51:51 +0200 |
| commit | 9cefaca1ea908df39edee03ef888a40690d355af (patch) | |
| tree | 4b9b70afc4215c45130a96c01e4d056b0ae362d1 /src/qml/CMakeLists.txt | |
| parent | d0c177f0ee42d7c9454f0093635a5f68362f2283 (diff) | |
Remove winrt
Task-number: QTBUG-84434
Change-Id: If8f57f00726868a3540c877d07fca761618e4f08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/CMakeLists.txt')
| -rw-r--r-- | src/qml/CMakeLists.txt | 29 |
1 files changed, 10 insertions, 19 deletions
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) |