aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/CMakeLists.txt1
-rw-r--r--tools/qml/.prev_CMakeLists.txt14
-rw-r--r--tools/qml/CMakeLists.txt20
-rw-r--r--tools/qmlcachegen/.prev_CMakeLists.txt4
-rw-r--r--tools/qmlcachegen/CMakeLists.txt4
-rw-r--r--tools/qmlformat/.prev_CMakeLists.txt19
-rw-r--r--tools/qmlformat/CMakeLists.txt20
-rw-r--r--tools/qmlimportscanner/.prev_CMakeLists.txt8
-rw-r--r--tools/qmlimportscanner/CMakeLists.txt8
-rw-r--r--tools/qmljs/.prev_CMakeLists.txt4
-rw-r--r--tools/qmljs/CMakeLists.txt4
-rw-r--r--tools/qmllint/.prev_CMakeLists.txt4
-rw-r--r--tools/qmllint/CMakeLists.txt4
-rw-r--r--tools/qmlplugindump/.prev_CMakeLists.txt8
-rw-r--r--tools/qmlplugindump/CMakeLists.txt8
-rw-r--r--tools/qmlpreview/.prev_CMakeLists.txt4
-rw-r--r--tools/qmlpreview/CMakeLists.txt4
-rw-r--r--tools/qmlprofiler/.prev_CMakeLists.txt4
-rw-r--r--tools/qmlprofiler/CMakeLists.txt4
-rw-r--r--tools/qmlscene/.prev_CMakeLists.txt7
-rw-r--r--tools/qmlscene/CMakeLists.txt7
-rw-r--r--tools/qmltime/CMakeLists.txt15
22 files changed, 108 insertions, 67 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 258a4a7569..b1c05782b3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,6 +4,7 @@
if(QT_FEATURE_qml_devtools)
add_subdirectory(qmllint)
add_subdirectory(qmlimportscanner)
+ add_subdirectory(qmlformat)
# special case: Do not build qmlcachegen here but build it at src/
# time, so that we can use it for our own .qml files in src/imports.
endif()
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt
index 31d9a65396..b9b93d02d3 100644
--- a/tools/qml/.prev_CMakeLists.txt
+++ b/tools/qml/.prev_CMakeLists.txt
@@ -8,11 +8,9 @@ qt_add_tool(qml
SOURCES
conf.h
main.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Qml
)
# Resources:
@@ -35,6 +33,8 @@ qt_add_resource(qml "qml"
#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
# ICON = "resources/qml-64.png"
# QMAKE_TARGET_DESCRIPTION = "QML" "Runtime"
+# QML_IMPORT_NAME = "QmlRuntime.Config"
+# QML_IMPORT_VERSION = "1.0"
## Scopes:
#####################################################################
@@ -61,3 +61,11 @@ qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
+
+set_target_properties(qml PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+ QT_QML_MODULE_VERSION 1.0
+ QT_QML_MODULE_URI QmlRuntime.Config
+)
+
+qt6_qml_type_registration(qml)
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index 6727f51a92..6edf190389 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -9,14 +9,18 @@ qt_add_tool(qml
SOURCES
conf.h
main.cpp
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Qml
)
# special case begin
+# Don't set properties on a host tool when cross compiling, because it
+# is not being built.
+if(CMAKE_CROSSCOMPILING)
+ return()
+endif()
+
set_source_files_properties(
conf/default.qml
conf/resizeToItem.qml
@@ -46,6 +50,8 @@ qt_add_resource(qml "qml"
#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
# ICON = "resources/qml-64.png"
# QMAKE_TARGET_DESCRIPTION = "QML" "Runtime"
+# QML_IMPORT_NAME = "QmlRuntime.Config"
+# QML_IMPORT_VERSION = "1.0"
## Scopes:
#####################################################################
@@ -72,3 +78,11 @@ qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
+
+set_target_properties(qml PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+ QT_QML_MODULE_VERSION 1.0
+ QT_QML_MODULE_URI QmlRuntime.Config
+)
+qt6_qml_type_registration(qml)
+
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index d8248b40ba..40ba09bc07 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -16,10 +16,8 @@ qt_add_tool(qmlcachegen
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
- Qt::QmlDevTools
+ Qt::QmlDevToolsPrivate
)
#### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>:
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index aa9215fd49..29302c1ef6 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -17,10 +17,8 @@ qt_add_tool(qmlcachegen
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
- Qt::QmlDevTools
+ Qt::QmlDevToolsPrivate
)
#### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>:
diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4f1f038f9b
--- /dev/null
+++ b/tools/qmlformat/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qmlformat.pro.
+
+#####################################################################
+## qmlformat Tool:
+#####################################################################
+
+qt_add_tool(qmlformat
+ SOURCES
+ commentastvisitor.cpp commentastvisitor.h
+ dumpastvisitor.cpp dumpastvisitor.h
+ main.cpp
+ restructureastvisitor.cpp restructureastvisitor.h
+ PUBLIC_LIBRARIES
+ Qt::QmlDevToolsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmlformat.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "QML" "Formatter"
+# _OPTION = "host_build"
diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt
new file mode 100644
index 0000000000..b83b8745d2
--- /dev/null
+++ b/tools/qmlformat/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qmlformat.pro.
+
+#####################################################################
+## qmlformat Tool:
+#####################################################################
+
+qt_add_tool(qmlformat
+ TOOLS_TARGET Qml # special case
+ SOURCES
+ commentastvisitor.cpp commentastvisitor.h
+ dumpastvisitor.cpp dumpastvisitor.h
+ main.cpp
+ restructureastvisitor.cpp restructureastvisitor.h
+ PUBLIC_LIBRARIES
+ Qt::QmlDevToolsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qmlformat.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "QML" "Formatter"
+# _OPTION = "host_build"
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index e69eb179d8..fbab757807 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -14,16 +14,14 @@ qt_add_tool(qmlimportscanner
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
- Qt::QmlDevTools
+ Qt::QmlDevToolsPrivate
)
#### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>:
# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
# CMAKE_DEBUG_TYPE = <EMPTY>
-# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])"
+# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX])"
# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY>
# CMAKE_RELEASE_TYPE = <EMPTY>
# QMAKE_SUBSTITUTES = "cmake_config_file"
@@ -42,7 +40,7 @@ qt_add_tool(qmlimportscanner
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_:
-# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/"
+# CMAKE_QML_DIR = "$$[QT_INSTALL_QML]/"
# CMAKE_QML_DIR_IS_ABSOLUTE = "True"
#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib:
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 4bbc8d0eee..30a4babfcd 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -15,16 +15,14 @@ qt_add_tool(qmlimportscanner
QT_NO_CAST_TO_ASCII
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
- Qt::QmlDevTools
+ Qt::QmlDevToolsPrivate
)
#### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>:
# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
# CMAKE_DEBUG_TYPE = <EMPTY>
-# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])"
+# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX])"
# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY>
# CMAKE_RELEASE_TYPE = <EMPTY>
# QMAKE_SUBSTITUTES = "cmake_config_file"
@@ -43,7 +41,7 @@ qt_add_tool(qmlimportscanner
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_:
-# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/"
+# CMAKE_QML_DIR = "$$[QT_INSTALL_QML]/"
# CMAKE_QML_DIR_IS_ABSOLUTE = "True"
#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib:
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt
index 0f845fa3ed..0096f335ae 100644
--- a/tools/qmljs/.prev_CMakeLists.txt
+++ b/tools/qmljs/.prev_CMakeLists.txt
@@ -31,11 +31,9 @@ qt_add_tool(qmljs
../../src/3rdparty/masm/stubs/runtime
../../src/3rdparty/masm/stubs/wtf
../../src/3rdparty/masm/wtf
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Qml
)
#### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>:
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 4655bfb9fc..a972a8ba1b 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -32,11 +32,9 @@ qt_add_tool(qmljs
../../src/3rdparty/masm/stubs/runtime
../../src/3rdparty/masm/stubs/wtf
../../src/3rdparty/masm/wtf
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlPrivate
- PUBLIC_LIBRARIES
- Qt::Qml
)
#### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>:
diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt
index 9c44abe33b..9e3667fead 100644
--- a/tools/qmllint/.prev_CMakeLists.txt
+++ b/tools/qmllint/.prev_CMakeLists.txt
@@ -14,11 +14,9 @@ qt_add_tool(qmllint
qcoloroutput.cpp qcoloroutput.h
scopetree.cpp scopetree.h
typedescriptionreader.cpp typedescriptionreader.h
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlDevToolsPrivate
- PUBLIC_LIBRARIES
- Qt::QmlDevTools
)
#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index ef06ec4abb..d4b0aad760 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -15,11 +15,9 @@ qt_add_tool(qmllint
qcoloroutput.cpp qcoloroutput.h
scopetree.cpp scopetree.h
typedescriptionreader.cpp typedescriptionreader.h
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::QmlDevToolsPrivate
- PUBLIC_LIBRARIES
- Qt::QmlDevTools
)
#### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index c5a8d1b1c1..c161a13077 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -11,14 +11,12 @@ qt_add_tool(qmlplugindump
qmltypereader.cpp qmltypereader.h
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::CorePrivate
- Qt::QmlPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Qml
- Qt::Quick
+ Qt::QmlPrivate
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>:
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 6f1af762cd..c2a84fcccc 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -12,14 +12,12 @@ qt_add_tool(qmlplugindump
qmltypereader.cpp qmltypereader.h
INCLUDE_DIRECTORIES
../shared
- LIBRARIES
- Qt::CorePrivate
- Qt::QmlPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
Qt::Qml
- Qt::Quick
+ Qt::QmlPrivate
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>:
diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt
index 87754e3ff0..05eb333bb2 100644
--- a/tools/qmlpreview/.prev_CMakeLists.txt
+++ b/tools/qmlpreview/.prev_CMakeLists.txt
@@ -9,11 +9,9 @@ qt_add_tool(qmlpreview
main.cpp
qmlpreviewapplication.cpp qmlpreviewapplication.h
qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h
- LIBRARIES
- Qt::QmlDebugPrivate
PUBLIC_LIBRARIES
Qt::Network
- Qt::QmlDebug
+ Qt::QmlDebugPrivate
)
#### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index b0885beee1..2adec05254 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -10,11 +10,9 @@ qt_add_tool(qmlpreview
main.cpp
qmlpreviewapplication.cpp qmlpreviewapplication.h
qmlpreviewfilesystemwatcher.cpp qmlpreviewfilesystemwatcher.h
- LIBRARIES
- Qt::QmlDebugPrivate
PUBLIC_LIBRARIES
Qt::Network
- Qt::QmlDebug
+ Qt::QmlDebugPrivate
)
#### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt
index f182f00b01..eb51932918 100644
--- a/tools/qmlprofiler/.prev_CMakeLists.txt
+++ b/tools/qmlprofiler/.prev_CMakeLists.txt
@@ -12,11 +12,9 @@ qt_add_tool(qmlprofiler
qmlprofilerapplication.cpp qmlprofilerapplication.h
qmlprofilerclient.cpp qmlprofilerclient.h
qmlprofilerdata.cpp qmlprofilerdata.h
- LIBRARIES
- Qt::QmlDebugPrivate
PUBLIC_LIBRARIES
Qt::Network
- Qt::QmlDebug
+ Qt::QmlDebugPrivate
)
#### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>:
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index 6ff683926b..6bc6fff823 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -13,11 +13,9 @@ qt_add_tool(qmlprofiler
qmlprofilerapplication.cpp qmlprofilerapplication.h
qmlprofilerclient.cpp qmlprofilerclient.h
qmlprofilerdata.cpp qmlprofilerdata.h
- LIBRARIES
- Qt::QmlDebugPrivate
PUBLIC_LIBRARIES
Qt::Network
- Qt::QmlDebug
+ Qt::QmlDebugPrivate
)
#### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>:
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index c56301e359..df4bfeaf44 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -9,14 +9,13 @@ qt_add_tool(qmlscene
main.cpp
DEFINES
QML_RUNTIME_TESTING
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Qml
Qt::Quick
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index 4212c627d4..b53816c494 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -10,14 +10,13 @@ qt_add_tool(qmlscene
main.cpp
DEFINES
QML_RUNTIME_TESTING
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::QuickPrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Qml
Qt::Quick
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index 4fb203cfbe..03425e9ecf 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -7,18 +7,27 @@
qt_add_executable(qmltime
GUI
SOURCES
- qmltime.cpp
- LIBRARIES
- Qt::QuickPrivate
+ qmltime.cpp qmltime.h
PUBLIC_LIBRARIES
Qt::Gui
Qt::Qml
Qt::Quick
+ Qt::QuickPrivate
)
#### Keys ignored in scope 1:.:.:qmltime.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "QML" "Time"
+# QML_IMPORT_NAME = "QmlTime"
+# QML_IMPORT_VERSION = "1.0"
# TEMPLATE = "app"
## Scopes:
#####################################################################
+
+set_target_properties(qmltime PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
+ QT_QML_MODULE_VERSION 1.0
+ QT_QML_MODULE_URI QmlTime
+)
+
+qt6_qml_type_registration(qmltime)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 23:53:46 +0000