diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-01-19 11:11:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-24 12:01:00 +0000 |
| commit | 8b6793662813739fd4c5281b4aa998057fe6a3e0 (patch) | |
| tree | e0faf3b2431017fa19b4a7380c8ca304e1a9b028 /tools | |
| parent | d0b8a4d82242718b68e2212a9536ecf79bf2f560 (diff) | |
Turn qmljs into app
It's tool, which means it's not built when cross-compiling. However,
it's to be desired on a target to run QML-only projects.
The earlier way to build app for a cross target was to set
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to ON. That seems like overkill.
Task-number: QTBUG-100040
Change-Id: I64236fb00a5d69862ce0c34ef9afca092d5d0436
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8c6b225f2aec39cfa255a183c28d8a78fa84b840)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmljs/CMakeLists.txt | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index 2f2e2fe610..01c7832f35 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -1,13 +1,11 @@ # Generated from qmljs.pro. ##################################################################### -## qmljs Tool: +## qmljs App: ##################################################################### -qt_get_tool_target_name(target_name qmljs) -qt_internal_add_tool(${target_name} +qt_internal_add_app(qmljs TARGET_DESCRIPTION "QML JavaScript Tool" - TOOLS_TARGET Qml # special case SOURCES qmljs.cpp DEFINES @@ -38,7 +36,8 @@ qt_internal_add_tool(${target_name} Qt::CorePrivate Qt::QmlPrivate ) -qt_internal_return_unless_building_tools() + +set_target_properties(qmljs PROPERTIES WIN32_EXECUTABLE FALSE) #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" @@ -47,42 +46,42 @@ qt_internal_return_unless_building_tools() ## Scopes: ##################################################################### -qt_internal_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(qmljs CONDITION WIN32 DEFINES NOMINMAX ) -qt_internal_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_internal_extend_target(${target_name} CONDITION NOT disassembler +qt_internal_extend_target(qmljs CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_internal_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_internal_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) |