diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 19:07:06 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 10:22:26 +0000 |
commit | e9cac99f3796740ea93b23b0fe893fc880e0b5d4 (patch) | |
tree | 7bb8d41c520e9d59bd2a39cf53ab8c948db57511 /tools/qmljs | |
parent | 82525a2b3861ad695c156c2cac4239134f8ac922 (diff) |
Regenerate projects
Change-Id: I38044c382e4d84b5865a19cdd04cc8922bd72a77
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmljs')
-rw-r--r-- | tools/qmljs/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | tools/qmljs/CMakeLists.txt | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 037ffdb8c5..2c3b500e03 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -41,7 +41,6 @@ add_qt_tool(qmljs #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" # TEMPLATE = "app" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -51,7 +50,7 @@ extend_target(qmljs CONDITION WIN32 NOMINMAX ) -extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64)) +extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -76,12 +75,12 @@ extend_target(qmljs CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index 14a9304bd1..300a9ac47a 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -42,7 +42,6 @@ add_qt_tool(qmljs #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" # TEMPLATE = "app" -# _LOADED = "qt_tool" ## Scopes: ##################################################################### @@ -52,7 +51,7 @@ extend_target(qmljs CONDITION WIN32 NOMINMAX ) -extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case +extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -77,12 +76,12 @@ extend_target(qmljs CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) |