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/qml | |
| 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/qml')
| -rw-r--r-- | tools/qml/.prev_CMakeLists.txt | 56 | ||||
| -rw-r--r-- | tools/qml/CMakeLists.txt | 57 |
2 files changed, 113 insertions, 0 deletions
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 +) |