diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:55:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 08:49:58 +0000 |
| commit | 31df3b6ced92197636e0b1f450631971bbf17cd2 (patch) | |
| tree | a7c5bb05b40b363af4a52058ef580fcab62b44bf /src/qml/.prev_CMakeLists.txt | |
| parent | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (diff) | |
Regenerate the necessary bits of qtdeclarative after wip/qt6 merge
Change-Id: If58c29baf7fa3c3591968fca6d11f7649308dbf9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/.prev_CMakeLists.txt')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index bbe31482e4..222e2a622b 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -503,6 +503,11 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale qml/qqmllocale.cpp qml/qqmllocale_p.h ) +extend_target(Qml CONDITION ANDROID + DEFINES + LIBS_SUFFIX='\\"_.so\\"' +) + extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_) LIBRARIES rt @@ -548,7 +553,7 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N -Wno-expansion-to-defined ) -#### Keys ignored in scope 64:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): +#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): # QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" extend_target(Qml CONDITION WINRT @@ -577,7 +582,7 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1 ../3rdparty/masm/disassembler/udis86/udis86_syn-intel.c ) -#### Keys ignored in scope 72:.:../3rdparty/masm:../3rdparty/masm/masm.pri:DEFINES___contains___WTF_USE_UDIS86=1: +#### Keys ignored in scope 73:.:../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" @@ -588,10 +593,10 @@ 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 74:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # GENERATEDDIR = "$$GENERATEDDIR/debug" -#### Keys ignored in scope 75:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: +#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else: # GENERATEDDIR = "$$GENERATEDDIR/release" extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG) |