diff options
28 files changed, 994 insertions, 8 deletions
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index c868dff329..24b87902ea 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -5,6 +5,8 @@ ##################################################################### add_qt_module(QmlDevTools + STATIC + INTERNAL_MODULE NO_SYNC_QT SOURCES ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h @@ -35,9 +37,9 @@ add_qt_module(QmlDevTools ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BUILD_DIR}/../qml - ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler - ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser + ${CMAKE_CURRENT_BINARY_DIR}/../qml + ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler + ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser LIBRARIES diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 5ac189074e..c8df1b7a75 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -5,6 +5,8 @@ ##################################################################### add_qt_module(QmlDevTools + STATIC + INTERNAL_MODULE NO_SYNC_QT SOURCES ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h @@ -35,19 +37,35 @@ add_qt_module(QmlDevTools ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BUILD_DIR}/../qml - ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler - ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser + ${CMAKE_CURRENT_BINARY_DIR}/../qml + ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler + ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser LIBRARIES Qt::CorePrivate - Qt::QmlPrivate # special case PUBLIC_LIBRARIES Qt::Core - Qt::Qml # special case ) +# special case begin +# Need to generate the parser files as in Qml module. +set(_qt_qlalr_flags "--no-debug" "--qt") +qt_process_qlalr("${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" QmlDevTools "${_qt_qlalr_flags}") + +# Need to propagate some of the include directories from Qml via QmlDevToolsPrivate +# for other tools, and also for the main QmlDevTools module, +# until we fix the script to handle internal_module to create only one single Private module. +qt_internal_module_info(qml_module "Qml") +set(_qml_dev_tools_private_includes + ${qml_module_include_dir} + ${qml_module_include_dir}/${PROJECT_VERSION} + ${qml_module_include_dir}/${PROJECT_VERSION}/${qml_module} + ) +target_include_directories(QmlDevTools PRIVATE ${_qml_dev_tools_private_includes}) +target_include_directories(QmlDevToolsPrivate INTERFACE ${_qml_dev_tools_private_includes}) +# special case end + #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>: # CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr" # MODULE_INCNAME = "QtQml" diff --git a/tools/.prev_CMakeLists.txt b/tools/.prev_CMakeLists.txt new file mode 100644 index 0000000000..2278b7ff0d --- /dev/null +++ b/tools/.prev_CMakeLists.txt @@ -0,0 +1,54 @@ +# Generated from tools.pro. + + +if(QT_FEATURE_qml_devtools) + add_subdirectory(qmllint) + add_subdirectory(qmlmin) + add_subdirectory(qmlimportscanner) + + if(QT_FEATURE_commandlineparser AND QT_FEATURE_xmlstreamwriter) + add_subdirectory(qmlcachegen) + endif() +endif() + +if(QT_FEATURE_thread AND NOT ANDROID OR android_app AND NOT WASM) + add_subdirectory(qml) + + if(QT_FEATURE_qml_profiler) + add_subdirectory(qmlprofiler) + endif() + + if(QT_FEATURE_qml_preview) + add_subdirectory(qmlpreview) + endif() + + if(TARGET Qt::Quick) + + if(NOT static) + add_subdirectory(qmlscene) + add_subdirectory(qmltime) + + if(QT_FEATURE_regularexpression AND QT_FEATURE_process) + add_subdirectory(qmlplugindump) + endif() + endif() + + if(TARGET Qt::Widgets) + + if(QT_FEATURE_dialogbuttonbox) + add_subdirectory(qmleasing) + endif() + endif() + endif() + + if(TARGET Qt::QuickTest) + add_subdirectory(qmltestrunner) + endif() + + if(QT_FEATURE_private_tests) + add_subdirectory(qmljs) + endif() +endif() + +if(QT_FEATURE_qml_devtools) +endif() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 0000000000..78e64b2d04 --- /dev/null +++ b/tools/CMakeLists.txt @@ -0,0 +1,54 @@ +# Generated from tools.pro. + + +if(QT_FEATURE_qml_devtools) + add_subdirectory(qmllint) + add_subdirectory(qmlmin) + add_subdirectory(qmlimportscanner) + + if(QT_FEATURE_commandlineparser AND QT_FEATURE_xmlstreamwriter) + add_subdirectory(qmlcachegen) + endif() +endif() + +if(QT_FEATURE_thread AND NOT ANDROID OR android_app AND NOT WASM) + add_subdirectory(qml) + + if(QT_FEATURE_qml_profiler) + add_subdirectory(qmlprofiler) + endif() + + if(QT_FEATURE_qml_preview) + add_subdirectory(qmlpreview) + endif() + + if(TARGET Qt::Quick) + + if(BUILD_SHARED_LIBS) # special case + add_subdirectory(qmlscene) + add_subdirectory(qmltime) + + if(QT_FEATURE_regularexpression AND QT_FEATURE_process) + add_subdirectory(qmlplugindump) + endif() + endif() + + if(TARGET Qt::Widgets) + + if(QT_FEATURE_dialogbuttonbox) + add_subdirectory(qmleasing) + endif() + endif() + endif() + + if(TARGET Qt::QuickTest) + add_subdirectory(qmltestrunner) + endif() + + if(QT_FEATURE_private_tests) + add_subdirectory(qmljs) + endif() +endif() + +if(QT_FEATURE_qml_devtools) +endif() diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c60900a954 --- /dev/null +++ b/tools/qml/.prev_CMakeLists.txt @@ -0,0 +1,56 @@ +# Generated from qml.pro. + +##################################################################### +## qml Tool: +##################################################################### + +add_qt_tool(qml + SOURCES + conf.h + main.cpp + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Qml +) + +# Resources: +add_qt_resource(qml "qml" PREFIX "qt-project.org/QmlRuntime" FILES + conf/content/resizeItemToWindow.qml + conf/content/resizeWindowToItem.qml + conf/default.qml + conf/resizeToItem.qml + resources/qml-64.png) + + +#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: +# ICON = "resources/qml64.png" +# QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qml CONDITION TARGET Qt::Gui + PUBLIC_LIBRARIES + Qt::Gui +) + +extend_target(qml CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +#### Keys ignored in scope 4:.:.:qml.pro:WIN32: +# RC_ICONS = "resources/qml.ico" + +#### Keys ignored in scope 5:.:.:qml.pro:APPLE_OSX: +# ICON = "resources/qml.icns" +# OTHER_FILES = "resources/Info.plist" +# QMAKE_INFO_PLIST = "resources/Info.plist" + +extend_target(qml CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt new file mode 100644 index 0000000000..b5f0abaee0 --- /dev/null +++ b/tools/qml/CMakeLists.txt @@ -0,0 +1,57 @@ +# Generated from qml.pro. + +##################################################################### +## qml Tool: +##################################################################### + +add_qt_tool(qml + TOOLS_TARGET Qml # special case + SOURCES + conf.h + main.cpp + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + PUBLIC_LIBRARIES + Qt::Qml +) + +# Resources: +add_qt_resource(qml "qml" PREFIX "qt-project.org/QmlRuntime" FILES + conf/content/resizeItemToWindow.qml + conf/content/resizeWindowToItem.qml + conf/default.qml + conf/resizeToItem.qml + resources/qml-64.png) + + +#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: +# ICON = "resources/qml64.png" +# QMAKE_TARGET_DESCRIPTION = "QML" "Runtime" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qml CONDITION TARGET Qt::Gui + PUBLIC_LIBRARIES + Qt::Gui +) + +extend_target(qml CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +#### Keys ignored in scope 4:.:.:qml.pro:WIN32: +# RC_ICONS = "resources/qml.ico" + +#### Keys ignored in scope 5:.:.:qml.pro:APPLE_OSX: +# ICON = "resources/qml.icns" +# OTHER_FILES = "resources/Info.plist" +# QMAKE_INFO_PLIST = "resources/Info.plist" + +extend_target(qml CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d4ad2adb6d --- /dev/null +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from qmlcachegen.pro. + +##################################################################### +## qmlcachegen Tool: +##################################################################### + +add_qt_tool(qmlcachegen + SOURCES + generateloader.cpp + qmlcachegen.cpp + resourcefilemapper.cpp resourcefilemapper.h + resourcefilter.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: +# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# QMAKE_SUBSTITUTES = "cmake_config_file" +# QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" +# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" +# _OPTION = "host_build" +# build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" +# build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" +# cmake_build_integration.files = "$$cmake_config_file.output" +# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QuickCompiler" +# cmake_config_file.input = "$$PWD/Qt5QuickCompilerConfig.cmake.in" +# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: +# INSTALLS = "build_integration" "cmake_build_integration" + +#### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: +# COPIES = "build_integration" "cmake_build_integration" + +#### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: +# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" +# CMAKE_BIN_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 5:.:.:qmlcachegen.pro:QMAKE_HOST.os___equals___Windows: +# CMAKE_BIN_SUFFIX = ".exe" diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt new file mode 100644 index 0000000000..253421bbc4 --- /dev/null +++ b/tools/qmlcachegen/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from qmlcachegen.pro. + +##################################################################### +## qmlcachegen Tool: +##################################################################### + +add_qt_tool(qmlcachegen + TOOLS_TARGET Qml # special case + SOURCES + generateloader.cpp + qmlcachegen.cpp + resourcefilemapper.cpp resourcefilemapper.h + resourcefilter.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: +# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# QMAKE_SUBSTITUTES = "cmake_config_file" +# QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" +# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" +# _OPTION = "host_build" +# build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" +# build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" +# cmake_build_integration.files = "$$cmake_config_file.output" +# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QuickCompiler" +# cmake_config_file.input = "$$PWD/Qt5QuickCompilerConfig.cmake.in" +# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: +# INSTALLS = "build_integration" "cmake_build_integration" + +#### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: +# COPIES = "build_integration" "cmake_build_integration" + +#### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: +# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" +# CMAKE_BIN_DIR_IS_ABSOLUTE = "True" + +#### Keys ignored in scope 5:.:.:qmlcachegen.pro:QMAKE_HOST.os___equals___Windows: +# CMAKE_BIN_SUFFIX = ".exe" diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt new file mode 100644 index 0000000000..036a554b51 --- /dev/null +++ b/tools/qmleasing/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from qmleasing.pro. + +##################################################################### +## qmleasing Binary: +##################################################################### + +add_qt_executable(qmleasing + GUI + SOURCES + import.ui + main.cpp + mainwindow.cpp mainwindow.h + pane.ui + properties.ui + segmentproperties.cpp segmentproperties.h + splineeditor.cpp splineeditor.h + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +# Resources: +add_qt_resource(qmleasing "resources" PREFIX "/" FILES + Button.qml + preview.qml) + + +#### Keys ignored in scope 1:.:.:qmleasing.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Easing" "Curve" "Editor" +# _LOADED = "qt_app" diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9400878c15 --- /dev/null +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qmlimportscanner.pro. + +##################################################################### +## qmlimportscanner Tool: +##################################################################### + +add_qt_tool(qmlimportscanner + SOURCES + main.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt new file mode 100644 index 0000000000..8bd1191b82 --- /dev/null +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qmlimportscanner.pro. + +##################################################################### +## qmlimportscanner Tool: +##################################################################### + +add_qt_tool(qmlimportscanner + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner" +# _LOADED = "qt_tool" +# _OPTION = "host_build" 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" diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3eb5872903 --- /dev/null +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qmllint.pro. + +##################################################################### +## qmllint Tool: +##################################################################### + +add_qt_tool(qmllint + SOURCES + main.cpp + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt new file mode 100644 index 0000000000..62cdbde95c --- /dev/null +++ b/tools/qmllint/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qmllint.pro. + +##################################################################### +## qmllint Tool: +##################################################################### + +add_qt_tool(qmllint + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9097a219aa --- /dev/null +++ b/tools/qmlmin/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qmlmin.pro. + +##################################################################### +## qmlmin Tool: +##################################################################### + +add_qt_tool(qmlmin + SOURCES + main.cpp + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt new file mode 100644 index 0000000000..046cd6d8fe --- /dev/null +++ b/tools/qmlmin/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qmlmin.pro. + +##################################################################### +## qmlmin Tool: +##################################################################### + +add_qt_tool(qmlmin + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + LIBRARIES + Qt::QmlDevToolsPrivate + PUBLIC_LIBRARIES + Qt::QmlDevTools +) + +#### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c9c78e6a55 --- /dev/null +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -0,0 +1,40 @@ +# Generated from qmlplugindump.pro. + +##################################################################### +## qmlplugindump Tool: +##################################################################### + +add_qt_tool(qmlplugindump + SOURCES + main.cpp + qmlstreamwriter.cpp qmlstreamwriter.h + qmltypereader.cpp qmltypereader.h + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper" +# QTPLUGIN.platforms = "qminimal" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmlplugindump CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(qmlplugindump CONDITION APPLE_OSX + LINK_OPTIONS + "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist" +) + +#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX: +# CONFIG = "-app_bundle" diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt new file mode 100644 index 0000000000..67abd0e516 --- /dev/null +++ b/tools/qmlplugindump/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from qmlplugindump.pro. + +##################################################################### +## qmlplugindump Tool: +##################################################################### + +add_qt_tool(qmlplugindump + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + qmlstreamwriter.cpp qmlstreamwriter.h + qmltypereader.cpp qmltypereader.h + LIBRARIES + Qt::CorePrivate + Qt::QmlPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper" +# QTPLUGIN.platforms = "qminimal" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmlplugindump CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(qmlplugindump CONDITION APPLE_OSX + LINK_OPTIONS + "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case +) + +#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX: +# CONFIG = "-app_bundle" diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4fbad0984b --- /dev/null +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qmlpreview.pro. + +##################################################################### +## qmlpreview Tool: +##################################################################### + +add_qt_tool(qmlpreview + SOURCES + main.cpp + qmlpreviewapplication.cpp qmlpreviewapplication.h + qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h + LIBRARIES + Qt::QmlDebugPrivate + PUBLIC_LIBRARIES + Qt::Network + Qt::QmlDebug +) + +#### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Preview" +# _LOADED = "qt_tool" diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt new file mode 100644 index 0000000000..84397a23ff --- /dev/null +++ b/tools/qmlpreview/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qmlpreview.pro. + +##################################################################### +## qmlpreview Tool: +##################################################################### + +add_qt_tool(qmlpreview + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + qmlpreviewapplication.cpp qmlpreviewapplication.h + qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h + LIBRARIES + Qt::QmlDebugPrivate + PUBLIC_LIBRARIES + Qt::Network + Qt::QmlDebug +) + +#### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Preview" +# _LOADED = "qt_tool" diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0bed3213bd --- /dev/null +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from qmlprofiler.pro. + +##################################################################### +## qmlprofiler Tool: +##################################################################### + +add_qt_tool(qmlprofiler + SOURCES + commandlistener.cpp commandlistener.h + constants.h + main.cpp + qmlprofilerapplication.cpp qmlprofilerapplication.h + qmlprofilerclient.cpp qmlprofilerclient.h + qmlprofilerdata.cpp qmlprofilerdata.h + LIBRARIES + Qt::QmlDebugPrivate + PUBLIC_LIBRARIES + Qt::Network + Qt::QmlDebug +) + +#### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Profiler" +# _LOADED = "qt_tool" diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt new file mode 100644 index 0000000000..d0b46b5bef --- /dev/null +++ b/tools/qmlprofiler/CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from qmlprofiler.pro. + +##################################################################### +## qmlprofiler Tool: +##################################################################### + +add_qt_tool(qmlprofiler + TOOLS_TARGET Qml # special case + SOURCES + commandlistener.cpp commandlistener.h + constants.h + main.cpp + qmlprofilerapplication.cpp qmlprofilerapplication.h + qmlprofilerclient.cpp qmlprofilerclient.h + qmlprofilerdata.cpp qmlprofilerdata.h + LIBRARIES + Qt::QmlDebugPrivate + PUBLIC_LIBRARIES + Qt::Network + Qt::QmlDebug +) + +#### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Profiler" +# _LOADED = "qt_tool" diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ba1c200bd0 --- /dev/null +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qmlscene.pro. + +##################################################################### +## qmlscene Tool: +##################################################################### + +add_qt_tool(qmlscene + SOURCES + main.cpp + DEFINES + QML_RUNTIME_TESTING + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmlscene CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(qmlscene CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt new file mode 100644 index 0000000000..e9796871f5 --- /dev/null +++ b/tools/qmlscene/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from qmlscene.pro. + +##################################################################### +## qmlscene Tool: +##################################################################### + +add_qt_tool(qmlscene + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + DEFINES + QML_RUNTIME_TESTING + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer" +# _LOADED = "qt_tool" + +## Scopes: +##################################################################### + +extend_target(qmlscene CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(qmlscene CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt new file mode 100644 index 0000000000..cace9385b7 --- /dev/null +++ b/tools/qmltestrunner/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qmltestrunner.pro. + +##################################################################### +## qmltestrunner Tool: +##################################################################### + +add_qt_tool(qmltestrunner + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::QuickTest +) + +#### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner" +# _LOADED = "qt_tool" diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt new file mode 100644 index 0000000000..5e942fe8ec --- /dev/null +++ b/tools/qmltestrunner/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qmltestrunner.pro. + +##################################################################### +## qmltestrunner Tool: +##################################################################### + +add_qt_tool(qmltestrunner + TOOLS_TARGET Qml # special case + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Qml + Qt::QuickTest +) + +#### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner" +# _LOADED = "qt_tool" diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt new file mode 100644 index 0000000000..b70d63a605 --- /dev/null +++ b/tools/qmltime/CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from qmltime.pro. + +##################################################################### +## qmltime Binary: +##################################################################### + +add_qt_executable(qmltime + GUI + SOURCES + qmltime.cpp + LIBRARIES + Qt::QuickPrivate + PUBLIC_LIBRARIES + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:qmltime.pro:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "QML" "Time" +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qmltime.pro:APPLE_OSX: +# CONFIG = "-app_bundle" |