diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:02:23 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:50:14 +0000 |
| commit | f0d23d3ff9da26a71295a6abd356c8d366d17439 (patch) | |
| tree | c68f990a0fda40a16c484ffb6403c165c44a73ba /src/qmlworkerscript | |
| parent | 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 (diff) | |
Regenerate qtdeclarative before merge
Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 7289ad9d11..51b6df5ea3 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -56,7 +56,7 @@ extend_target(QmlWorkerScript CONDITION WIN32 NOMINMAX ) -extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64)) +extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -81,12 +81,12 @@ extend_target(QmlWorkerScript CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 4c8aa17f59..9abfb586ba 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -56,7 +56,7 @@ extend_target(QmlWorkerScript CONDITION WIN32 NOMINMAX ) -extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case +extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) @@ -81,12 +81,12 @@ extend_target(QmlWorkerScript CONDITION NOT disassembler WTF_USE_UDIS86=0 ) -extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release) +extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6)) +extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) |