aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/CMakeLists.txt')
-rw-r--r--src/qml/CMakeLists.txt76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index df2cdf417d..3d476ad6f6 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
## Qml Module:
#####################################################################
-add_qt_module(Qml
+qt_add_module(Qml
PLUGIN_TYPES qmltooling
SOURCES
../3rdparty/llvm/include/llvm-c/DataTypes.h
@@ -345,24 +345,24 @@ qt_declarative_generate_reg_exp_jit_tables(Qml)
## Scopes:
#####################################################################
-extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
SOURCES
qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
PUBLIC_LIBRARIES
Qt::Network
)
-extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
LINK_OPTIONS
"/BASE:0x66000000"
)
-extend_target(Qml CONDITION MSVC
+qt_extend_target(Qml CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
-extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWin.cpp
PUBLIC_LIBRARIES
@@ -372,12 +372,12 @@ extend_target(Qml CONDITION WIN32 AND NOT WINRT
#### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
COMPILE_OPTIONS
-fno-reorder-blocks
)
-extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
@@ -386,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
-ftest-coverage
)
-extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
+qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
COMPILE_OPTIONS
-d2SSAOptimizer-
)
@@ -397,7 +397,7 @@ extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19)
#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
# WERROR = "-Wno-error=unused-const-variable"
-extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
SOURCES
jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -407,7 +407,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_jit
jit
)
-extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
SOURCES
animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -437,12 +437,12 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)
-extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
SOURCES
debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
debugger/qqmlconfigurabledebugservice_p.h
@@ -459,100 +459,100 @@ extend_target(Qml CONDITION QT_FEATURE_qml_debug
jsruntime/qv4profiling.cpp
)
-extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
SOURCES
jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
)
-extend_target(Qml CONDITION UNIX
+qt_extend_target(Qml CONDITION UNIX
SOURCES
jsruntime/qv4compilationunitmapper_unix.cpp
jsruntime/qv4functiontable_unix.cpp
)
-extend_target(Qml CONDITION WIN32
+qt_extend_target(Qml CONDITION WIN32
SOURCES
jsruntime/qv4compilationunitmapper_win.cpp
DEFINES
NOMINMAX
)
-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 AND NOT WINRT
SOURCES
jsruntime/qv4functiontable_win64.cpp
)
-extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
SOURCES
jsruntime/qv4functiontable_noop.cpp
)
-extend_target(Qml CONDITION valgrind
+qt_extend_target(Qml CONDITION valgrind
DEFINES
V4_USE_VALGRIND
)
-extend_target(Qml CONDITION heaptrack
+qt_extend_target(Qml CONDITION heaptrack
DEFINES
V4_USE_HEAPTRACK
)
-extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
SOURCES
qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
)
-extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
SOURCES
qml/qqmllocale.cpp qml/qqmllocale_p.h
)
-extend_target(Qml CONDITION ANDROID
+qt_extend_target(Qml CONDITION ANDROID
DEFINES
LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
)
-extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
LIBRARIES
rt
)
-extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
SOURCES
types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
)
-extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(Qml CONDITION NOT disassembler
+qt_extend_target(Qml CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
@@ -560,22 +560,22 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
#### 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
+qt_extend_target(Qml CONDITION WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
)
-extend_target(Qml CONDITION INTEGRITY
+qt_extend_target(Qml CONDITION INTEGRITY
SOURCES
../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
)
-extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorPosix.cpp
)
-extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
SOURCES
../3rdparty/masm/disassembler/udis86/udis86.c
../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -603,20 +603,20 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
#### 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)
+qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
COMPILE_OPTIONS
-Wno-c++0x-extensions
-Wno-c++11-extensions
)
-extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
+qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
COMPILE_OPTIONS
-Wno-c++0x-compat
)
qt_create_tracepoints(Qml qtqml.tracepoints)
-add_qt_docs(Qml
+qt_add_docs(Qml
doc/qtqml.qdocconf
)