diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 17:02:52 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-08 08:22:42 +0000 |
commit | 5a3e668533450e82d0159596e5c24e738905f5f7 (patch) | |
tree | 87e769d1cd0f6c6d9e83d309eebab46ad634ece8 /tools/qmljs | |
parent | f6f5687032bd6451e52c9ef221fb6a8a5b194389 (diff) |
Port the declarative tools
Also fix up QmlDevTools module to not depend on QtQml,
but instead make it include the headers / cpp files as it is done
in the qmake project.
Change-Id: I240c52d5357db150a7c0c819892fb0a3708ceee4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmljs')
-rw-r--r-- | tools/qmljs/.prev_CMakeLists.txt | 90 | ||||
-rw-r--r-- | tools/qmljs/CMakeLists.txt | 91 |
2 files changed, 181 insertions, 0 deletions
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt new file mode 100644 index 0000000000..037ffdb8c5 --- /dev/null +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -0,0 +1,90 @@ +# Generated from qmljs.pro. + +##################################################################### +## qmljs Tool: +##################################################################### + +add_qt_tool(qmljs + SOURCES + qmljs.cpp + DEFINES + BUILDING_QT__ + ENABLE_ASSEMBLER_WX_EXCLUSIVE=1 + ENABLE_DFG_JIT=0 + ENABLE_DFG_JIT_UTILITY_METHODS=1 + ENABLE_JIT_CONSTANT_BLINDING=0 + ENABLE_LLINT=0 + JS_EXPORT_PRIVATE="" + WTFInvokeCrashHook=qmlWTFInvokeCrashHook + WTFReportAssertionFailure=qmlWTFReportAssertionFailure + WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage + WTFReportBacktrace=qmlWTFReportBacktrace + WTF_EXPORT_PRIVATE="" + INCLUDE_DIRECTORIES + ../../src/3rdparty/masm + ../../src/3rdparty/masm/assembler + ../../src/3rdparty/masm/disassembler + ../../src/3rdparty/masm/disassembler/udis86 + ../../src/3rdparty/masm/jit + ../../src/3rdparty/masm/runtime + ../../src/3rdparty/masm/stubs + ../../src/3rdparty/masm/stubs/runtime + ../../src/3rdparty/masm/stubs/wtf + ../../src/3rdparty/masm/wtf + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Qml +) + +#### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" +# TEMPLATE = "app" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmljs CONDITION WIN32 + DEFINES + NOMINMAX +) + +extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64)) + DEFINES + WTF_USE_UDIS86=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler + DEFINES + WTF_USE_ARMV7_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler + DEFINES + WTF_USE_ARM64_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler + DEFINES + WTF_USE_MIPS32_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION NOT disassembler + DEFINES + WTF_USE_UDIS86=0 +) + +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)) + COMPILE_OPTIONS + -Wno-expansion-to-defined +) + +#### Keys ignored in scope 12:.:../../src/3rdparty/masm:../../src/3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): +# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt new file mode 100644 index 0000000000..14a9304bd1 --- /dev/null +++ b/tools/qmljs/CMakeLists.txt @@ -0,0 +1,91 @@ +# Generated from qmljs.pro. + +##################################################################### +## qmljs Tool: +##################################################################### + +add_qt_tool(qmljs + TOOLS_TARGET Qml # special case + SOURCES + qmljs.cpp + DEFINES + BUILDING_QT__ + ENABLE_ASSEMBLER_WX_EXCLUSIVE=1 + ENABLE_DFG_JIT=0 + ENABLE_DFG_JIT_UTILITY_METHODS=1 + ENABLE_JIT_CONSTANT_BLINDING=0 + ENABLE_LLINT=0 + JS_EXPORT_PRIVATE= # special case + WTFInvokeCrashHook=qmlWTFInvokeCrashHook + WTFReportAssertionFailure=qmlWTFReportAssertionFailure + WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage + WTFReportBacktrace=qmlWTFReportBacktrace + WTF_EXPORT_PRIVATE= # special case + INCLUDE_DIRECTORIES + ../../src/3rdparty/masm + ../../src/3rdparty/masm/assembler + ../../src/3rdparty/masm/disassembler + ../../src/3rdparty/masm/disassembler/udis86 + ../../src/3rdparty/masm/jit + ../../src/3rdparty/masm/runtime + ../../src/3rdparty/masm/stubs + ../../src/3rdparty/masm/stubs/runtime + ../../src/3rdparty/masm/stubs/wtf + ../../src/3rdparty/masm/wtf + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Qml +) + +#### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool" +# TEMPLATE = "app" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmljs CONDITION WIN32 + DEFINES + NOMINMAX +) + +extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case + DEFINES + WTF_USE_UDIS86=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler + DEFINES + WTF_USE_ARMV7_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler + DEFINES + WTF_USE_ARM64_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler + DEFINES + WTF_USE_MIPS32_DISASSEMBLER=1 +) + +extend_target(qmljs CONDITION NOT disassembler + DEFINES + WTF_USE_UDIS86=0 +) + +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)) + COMPILE_OPTIONS + -Wno-expansion-to-defined +) + +#### Keys ignored in scope 12:.:../../src/3rdparty/masm:../../src/3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6): +# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined" |