aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlworkerscript
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 15:23:08 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-10-06 13:19:37 +0200
commit08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch)
tree0ae21548926596fb41e7e71c4bb14d1973245bde /src/qmlworkerscript
parentc52a857c2b6b89abeddeee8489110ab9dd363e53 (diff)
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
-rw-r--r--src/qmlworkerscript/.prev_CMakeLists.txt20
-rw-r--r--src/qmlworkerscript/CMakeLists.txt20
2 files changed, 20 insertions, 20 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 0ce8a06c72..edfc1a298a 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlWorkerScript Module:
#####################################################################
-qt_add_module(QmlWorkerScript
+qt_internal_add_module(QmlWorkerScript
GENERATE_METATYPES
SOURCES
qquickworkerscript.cpp qquickworkerscript_p.h
@@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript
## Scopes:
#####################################################################
-qt_extend_target(QmlWorkerScript CONDITION WIN32
+qt_internal_extend_target(QmlWorkerScript CONDITION WIN32
DEFINES
NOMINMAX
)
-qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
#### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-qt_add_docs(QmlWorkerScript
+qt_internal_add_docs(QmlWorkerScript
doc/qtqmlworkerscript.qdocconf
)
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 36e2b0dc68..5143edabde 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlWorkerScript Module:
#####################################################################
-qt_add_module(QmlWorkerScript
+qt_internal_add_module(QmlWorkerScript
GENERATE_METATYPES
SOURCES
qquickworkerscript.cpp qquickworkerscript_p.h
@@ -57,49 +57,49 @@ qt_add_module(QmlWorkerScript
## Scopes:
#####################################################################
-qt_extend_target(QmlWorkerScript CONDITION WIN32
+qt_internal_extend_target(QmlWorkerScript CONDITION WIN32
DEFINES
NOMINMAX
)
-qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_internal_extend_target(QmlWorkerScript CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_internal_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_internal_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
#### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-qt_add_docs(QmlWorkerScript
+qt_internal_add_docs(QmlWorkerScript
doc/qtqmlworkerscript.qdocconf
)