summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.prev_CMakeLists.txt15
-rw-r--r--CMakeLists.txt12
-rw-r--r--src/designer/src/components/lib/CMakeLists.txt268
-rw-r--r--src/designer/src/designer/CMakeLists.txt5
-rw-r--r--src/designer/src/lib/CMakeLists.txt175
-rw-r--r--src/designer/src/plugins/qquickwidget/CMakeLists.txt3
-rw-r--r--src/designer/src/uitools/CMakeLists.txt5
-rw-r--r--src/linguist/.prev_CMakeLists.txt2
-rw-r--r--src/linguist/CMakeLists.txt4
-rw-r--r--src/linguist/linguist/CMakeLists.txt2
-rw-r--r--src/linguist/lprodump/CMakeLists.txt2
-rw-r--r--src/linguist/lrelease-pro/CMakeLists.txt2
-rw-r--r--src/linguist/lrelease/CMakeLists.txt2
-rw-r--r--src/linguist/lupdate-pro/CMakeLists.txt2
-rw-r--r--src/linguist/lupdate/CMakeLists.txt2
-rw-r--r--src/qdoc/.prev_CMakeLists.txt15
-rw-r--r--src/qdoc/CMakeLists.txt18
-rw-r--r--src/qtattributionsscanner/CMakeLists.txt8
18 files changed, 283 insertions, 259 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
new file mode 100644
index 000000000..5546e9a6d
--- /dev/null
+++ b/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qttools.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(tools_FIXME
+ VERSION 6.0.0
+ DESCRIPTION "Qt tools_FIXME Libraries"
+ HOMEPAGE_URL "https://qt.io/"
+ LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+qt_build_repo()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e3dc6af2..65f584507 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,16 @@
+# Generated from qttools.pro.
+
cmake_minimum_required(VERSION 3.15.0)
-project(QtTools
+project(QtTools # special case
VERSION 6.0.0
- DESCRIPTION "Qt Tools"
+ DESCRIPTION "Qt Tools" # special case
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core
- OPTIONAL_COMPONENTS Xml Widgets Quick QuickWidgets)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Xml Widgets Quick QuickWidgets) # special case
+
qt_build_repo()
+
diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt
index 1b3bf7183..afe73e08b 100644
--- a/src/designer/src/components/lib/CMakeLists.txt
+++ b/src/designer/src/components/lib/CMakeLists.txt
@@ -124,6 +124,8 @@ add_qt_module(DesignerComponents
Qt::Xml
ENABLE_AUTOGEN_TOOLS
uic
+ PRECOMPILED_HEADER
+ "lib_pch.h"
)
# Resources:
@@ -875,7 +877,6 @@ add_qt_resource(DesignerComponents "widgetbox"
#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
# MODULE = "designercomponents"
-# PRECOMPILED_HEADER = "lib_pch.h"
# _LOADED = "qt_module"
## Scopes:
@@ -913,135 +914,136 @@ extend_target(DesignerComponents CONDITION QT_BUILD_SHARED_LIBS
../../../../shared/qtpropertybrowser
)
-# Resources:
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-arrow.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-arrow.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-busy.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-busy.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-closedhand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-closedhand.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-cross.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-cross.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-forbidden.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-forbidden.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-hand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hand.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-hsplit.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hsplit.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-ibeam.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-ibeam.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-openhand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-openhand.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeall.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeall.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeb.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeb.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizef.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizef.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeh.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeh.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizev.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizev.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-uparrow.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-uparrow.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-vsplit.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-vsplit.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-wait.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-wait.png"
-)
-set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-whatsthis.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-whatsthis.png"
-)
-set(qtpropertybrowser_resource_files
- "images/cursor-arrow.png"
- "images/cursor-busy.png"
- "images/cursor-closedhand.png"
- "images/cursor-cross.png"
- "images/cursor-forbidden.png"
- "images/cursor-hand.png"
- "images/cursor-hsplit.png"
- "images/cursor-ibeam.png"
- "images/cursor-openhand.png"
- "images/cursor-sizeall.png"
- "images/cursor-sizeb.png"
- "images/cursor-sizef.png"
- "images/cursor-sizeh.png"
- "images/cursor-sizev.png"
- "images/cursor-uparrow.png"
- "images/cursor-vsplit.png"
- "images/cursor-wait.png"
- "images/cursor-whatsthis.png"
-)
-
-add_qt_resource(DesignerComponents "qtpropertybrowser_designercomponents" # special case
- PREFIX
- "/qt-project.org/qtpropertybrowser"
- BASE
- "../../../../shared/qtpropertybrowser"
- FILES
- ${qtpropertybrowser_resource_files}
-)
-set_source_files_properties("../../../../shared/findwidget/images/mac/closetab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/mac/closetab.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/mac/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/mac/next.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/mac/previous.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/mac/previous.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/mac/searchfind.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/mac/searchfind.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/win/closetab.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/win/closetab.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/win/next.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/win/next.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/win/previous.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/win/previous.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/win/searchfind.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/win/searchfind.png"
-)
-set_source_files_properties("../../../../shared/findwidget/images/wrap.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/wrap.png"
-)
-set(findwidget_resource_files
- "images/mac/closetab.png"
- "images/mac/next.png"
- "images/mac/previous.png"
- "images/mac/searchfind.png"
- "images/win/closetab.png"
- "images/win/next.png"
- "images/win/previous.png"
- "images/win/searchfind.png"
- "images/wrap.png"
-)
-
-add_qt_resource(DesignerComponents "findwidget_designercomponents" # special case
- PREFIX
- "/qt-project.org/shared"
- BASE
- "../../../../shared/findwidget"
- FILES
- ${findwidget_resource_files}
-)
-
+if(QT_BUILD_SHARED_LIBS)
+ # Resources:
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-arrow.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-arrow.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-busy.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-busy.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-closedhand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-closedhand.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-cross.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-cross.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-forbidden.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-forbidden.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-hand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hand.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-hsplit.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hsplit.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-ibeam.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-ibeam.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-openhand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-openhand.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeall.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeall.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeb.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeb.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizef.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizef.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizeh.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeh.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-sizev.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizev.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-uparrow.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-uparrow.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-vsplit.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-vsplit.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-wait.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-wait.png"
+ )
+ set_source_files_properties("../../../../shared/qtpropertybrowser/images/cursor-whatsthis.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-whatsthis.png"
+ )
+ set(qtpropertybrowser_resource_files
+ "images/cursor-arrow.png"
+ "images/cursor-busy.png"
+ "images/cursor-closedhand.png"
+ "images/cursor-cross.png"
+ "images/cursor-forbidden.png"
+ "images/cursor-hand.png"
+ "images/cursor-hsplit.png"
+ "images/cursor-ibeam.png"
+ "images/cursor-openhand.png"
+ "images/cursor-sizeall.png"
+ "images/cursor-sizeb.png"
+ "images/cursor-sizef.png"
+ "images/cursor-sizeh.png"
+ "images/cursor-sizev.png"
+ "images/cursor-uparrow.png"
+ "images/cursor-vsplit.png"
+ "images/cursor-wait.png"
+ "images/cursor-whatsthis.png"
+ )
+
+ add_qt_resource(DesignerComponents "qtpropertybrowser"
+ PREFIX
+ "/qt-project.org/qtpropertybrowser"
+ BASE
+ "../../../../shared/qtpropertybrowser"
+ FILES
+ ${qtpropertybrowser_resource_files}
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/mac/closetab.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/mac/closetab.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/mac/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/mac/next.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/mac/previous.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/mac/previous.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/mac/searchfind.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/mac/searchfind.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/win/closetab.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/win/closetab.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/win/next.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/win/next.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/win/previous.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/win/previous.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/win/searchfind.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/win/searchfind.png"
+ )
+ set_source_files_properties("../../../../shared/findwidget/images/wrap.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/wrap.png"
+ )
+ set(findwidget_resource_files
+ "images/mac/closetab.png"
+ "images/mac/next.png"
+ "images/mac/previous.png"
+ "images/mac/searchfind.png"
+ "images/win/closetab.png"
+ "images/win/next.png"
+ "images/win/previous.png"
+ "images/win/searchfind.png"
+ "images/wrap.png"
+ )
+
+ add_qt_resource(DesignerComponents "findwidget"
+ PREFIX
+ "/qt-project.org/shared"
+ BASE
+ "../../../../shared/findwidget"
+ FILES
+ ${findwidget_resource_files}
+ )
+endif()
diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
index a3f04d467..a4e0c8eed 100644
--- a/src/designer/src/designer/CMakeLists.txt
+++ b/src/designer/src/designer/CMakeLists.txt
@@ -46,6 +46,8 @@ add_qt_executable(designer
Qt::Xml
ENABLE_AUTOGEN_TOOLS
uic
+ PRECOMPILED_HEADER
+ "qdesigner_pch.h"
)
# Resources:
@@ -97,7 +99,6 @@ add_qt_resource(designer "qttoolbardialog"
#### Keys ignored in scope 1:.:.:designer.pro:<TRUE>:
-# PRECOMPILED_HEADER = "qdesigner_pch.h"
# QMAKE_TARGET_DESCRIPTION = "Qt" "Designer"
# _LOADED = "qt_app"
@@ -132,7 +133,7 @@ extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU
PUBLIC_LIBRARIES
m
)
-add_qt_docs(
+add_qt_docs(designer
doc/qtdesigner.qdocconf
)
diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt
index 327dd6ae3..160e4828b 100644
--- a/src/designer/src/lib/CMakeLists.txt
+++ b/src/designer/src/lib/CMakeLists.txt
@@ -172,6 +172,8 @@ add_qt_module(Designer
Qt::Xml
ENABLE_AUTOGEN_TOOLS
uic
+ PRECOMPILED_HEADER
+ "lib_pch.h"
)
# Resources:
@@ -438,8 +440,6 @@ add_qt_resource(Designer "qtgradienteditor"
#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
# MODULE = "designer"
-# MODULE_PLUGIN_TYPES = "designer"
-# PRECOMPILED_HEADER = "lib_pch.h"
# _LOADED = "qt_module"
## Scopes:
@@ -464,91 +464,92 @@ extend_target(Designer CONDITION NOT QT_BUILD_SHARED_LIBS
../../../shared/qtpropertybrowser
)
-# Resources:
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-arrow.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-arrow.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-busy.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-busy.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-closedhand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-closedhand.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-cross.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-cross.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-forbidden.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-forbidden.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-hand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hand.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-hsplit.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hsplit.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-ibeam.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-ibeam.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-openhand.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-openhand.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeall.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeall.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeb.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeb.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizef.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizef.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeh.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeh.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizev.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizev.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-uparrow.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-uparrow.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-vsplit.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-vsplit.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-wait.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-wait.png"
-)
-set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-whatsthis.png"
- PROPERTIES QT_RESOURCE_ALIAS "images/cursor-whatsthis.png"
-)
-set(qtpropertybrowser_resource_files
- "images/cursor-arrow.png"
- "images/cursor-busy.png"
- "images/cursor-closedhand.png"
- "images/cursor-cross.png"
- "images/cursor-forbidden.png"
- "images/cursor-hand.png"
- "images/cursor-hsplit.png"
- "images/cursor-ibeam.png"
- "images/cursor-openhand.png"
- "images/cursor-sizeall.png"
- "images/cursor-sizeb.png"
- "images/cursor-sizef.png"
- "images/cursor-sizeh.png"
- "images/cursor-sizev.png"
- "images/cursor-uparrow.png"
- "images/cursor-vsplit.png"
- "images/cursor-wait.png"
- "images/cursor-whatsthis.png"
-)
-
-add_qt_resource(Designer "qtpropertybrowser"
- PREFIX
- "/qt-project.org/qtpropertybrowser"
- BASE
- "../../../shared/qtpropertybrowser"
- FILES
- ${qtpropertybrowser_resource_files}
-)
-
+if(NOT QT_BUILD_SHARED_LIBS)
+ # Resources:
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-arrow.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-arrow.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-busy.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-busy.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-closedhand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-closedhand.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-cross.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-cross.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-forbidden.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-forbidden.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-hand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hand.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-hsplit.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-hsplit.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-ibeam.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-ibeam.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-openhand.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-openhand.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeall.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeall.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeb.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeb.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizef.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizef.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizeh.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizeh.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-sizev.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-sizev.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-uparrow.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-uparrow.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-vsplit.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-vsplit.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-wait.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-wait.png"
+ )
+ set_source_files_properties("../../../shared/qtpropertybrowser/images/cursor-whatsthis.png"
+ PROPERTIES QT_RESOURCE_ALIAS "images/cursor-whatsthis.png"
+ )
+ set(qtpropertybrowser_resource_files
+ "images/cursor-arrow.png"
+ "images/cursor-busy.png"
+ "images/cursor-closedhand.png"
+ "images/cursor-cross.png"
+ "images/cursor-forbidden.png"
+ "images/cursor-hand.png"
+ "images/cursor-hsplit.png"
+ "images/cursor-ibeam.png"
+ "images/cursor-openhand.png"
+ "images/cursor-sizeall.png"
+ "images/cursor-sizeb.png"
+ "images/cursor-sizef.png"
+ "images/cursor-sizeh.png"
+ "images/cursor-sizev.png"
+ "images/cursor-uparrow.png"
+ "images/cursor-vsplit.png"
+ "images/cursor-wait.png"
+ "images/cursor-whatsthis.png"
+ )
+
+ add_qt_resource(Designer "qtpropertybrowser"
+ PREFIX
+ "/qt-project.org/qtpropertybrowser"
+ BASE
+ "../../../shared/qtpropertybrowser"
+ FILES
+ ${qtpropertybrowser_resource_files}
+ )
+endif()
extend_target(Designer CONDITION QT_BUILD_SHARED_LIBS
SOURCES
diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt
index 5607c2489..dcfd0989c 100644
--- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt
+++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt
@@ -29,6 +29,3 @@ add_qt_resource(qquickwidget "qquickwidget_plugin"
${qquickwidget_plugin_resource_files}
)
-
-#### Keys ignored in scope 1:.:.:qquickwidget.pro:<TRUE>:
-# PLUGIN_CLASS_NAME = "QQuickWidgetPlugin"
diff --git a/src/designer/src/uitools/CMakeLists.txt b/src/designer/src/uitools/CMakeLists.txt
index 060c0f47f..4623e84d2 100644
--- a/src/designer/src/uitools/CMakeLists.txt
+++ b/src/designer/src/uitools/CMakeLists.txt
@@ -35,10 +35,7 @@ add_qt_module(UiTools
## Scopes:
#####################################################################
-
-#### Keys ignored in scope 2:.:.:uitools.pro:NOT qtBuildPart(tools):
-# MODULE_PLUGIN_TYPES = "designer"
-add_qt_docs(
+add_qt_docs(UiTools
doc/qtuitools.qdocconf
)
diff --git a/src/linguist/.prev_CMakeLists.txt b/src/linguist/.prev_CMakeLists.txt
index 00d6d3bf2..94b6ab25f 100644
--- a/src/linguist/.prev_CMakeLists.txt
+++ b/src/linguist/.prev_CMakeLists.txt
@@ -6,6 +6,6 @@ add_subdirectory(lrelease)
add_subdirectory(lrelease-pro)
add_subdirectory(lupdate)
add_subdirectory(lupdate-pro)
-if(((NOT no-png AND TARGET Qt::Widgets AND QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton)))
+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
add_subdirectory(linguist)
endif()
diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt
index c82edb217..36f777322 100644
--- a/src/linguist/CMakeLists.txt
+++ b/src/linguist/CMakeLists.txt
@@ -6,6 +6,8 @@ add_subdirectory(lrelease)
add_subdirectory(lrelease-pro)
add_subdirectory(lupdate)
add_subdirectory(lupdate-pro)
-#if(((QT_FEATURE_png AND TARGET Qt::Widgets AND QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton))) # special case
+# special case begin TODO
+#if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
# add_subdirectory(linguist)
#endif()
+# special case end
diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt
index 2bbc7c8d2..eda0e9c4e 100644
--- a/src/linguist/linguist/CMakeLists.txt
+++ b/src/linguist/linguist/CMakeLists.txt
@@ -154,7 +154,7 @@ extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_
#### Keys ignored in scope 5:.:.:linguist.pro:APPLE:
# ICON = "linguist.icns"
# QMAKE_INFO_PLIST = "Info_mac.plist"
-add_qt_docs(
+add_qt_docs(linguist
doc/qtlinguist.qdocconf
)
diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt
index e7a29b98b..f356f810a 100644
--- a/src/linguist/lprodump/CMakeLists.txt
+++ b/src/linguist/lprodump/CMakeLists.txt
@@ -53,4 +53,4 @@ add_qt_resource(lprodump "proparser"
# _LOADED = "qt_tool"
# _OPTION = "host_build"
# qmake.name = "QMAKE"
-# qmake.value = "join($$QMAKE_QMAKE)"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt
index 791687912..fa0c34d44 100644
--- a/src/linguist/lrelease-pro/CMakeLists.txt
+++ b/src/linguist/lrelease-pro/CMakeLists.txt
@@ -21,4 +21,4 @@ add_qt_tool(lrelease-pro
# _LOADED = "qt_tool"
# _OPTION = "host_build"
# qmake.name = "QMAKE"
-# qmake.value = "join($$QMAKE_QMAKE)"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt
index f0d60ab33..03b149af7 100644
--- a/src/linguist/lrelease/CMakeLists.txt
+++ b/src/linguist/lrelease/CMakeLists.txt
@@ -34,4 +34,4 @@ add_qt_tool(lrelease
# _LOADED = "qt_tool"
# _OPTION = "host_build"
# qmake.name = "QMAKE"
-# qmake.value = "join($$QMAKE_QMAKE)"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt
index 078bd8e02..958ba19a2 100644
--- a/src/linguist/lupdate-pro/CMakeLists.txt
+++ b/src/linguist/lupdate-pro/CMakeLists.txt
@@ -21,7 +21,7 @@ add_qt_tool(lupdate-pro
# _LOADED = "qt_tool"
# _OPTION = "host_build"
# qmake.name = "QMAKE"
-# qmake.value = "join($$QMAKE_QMAKE)"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
## Scopes:
#####################################################################
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt
index 741a1c2ab..7a1e7bcd3 100644
--- a/src/linguist/lupdate/CMakeLists.txt
+++ b/src/linguist/lupdate/CMakeLists.txt
@@ -41,7 +41,7 @@ add_qt_tool(lupdate
# _LOADED = "qt_tool"
# _OPTION = "host_build"
# qmake.name = "QMAKE"
-# qmake.value = "join($$QMAKE_QMAKE)"
+# qmake.value = "$$shell_path($$QMAKE_QMAKE)"
## Scopes:
#####################################################################
diff --git a/src/qdoc/.prev_CMakeLists.txt b/src/qdoc/.prev_CMakeLists.txt
index ef28cd764..29816f431 100644
--- a/src/qdoc/.prev_CMakeLists.txt
+++ b/src/qdoc/.prev_CMakeLists.txt
@@ -45,17 +45,17 @@ add_qt_tool(qdoc
webxmlgenerator.cpp webxmlgenerator.h
yyindent.cpp
DEFINES
+ (CLANG_RESOURCE_DIR=\"/clang//include\")
QDOC2_COMPAT
- join(CLANG_RESOURCE_DIR=\"/clang//include\")
INCLUDE_DIRECTORIES
${QT_SOURCE_TREE}/src/tools/qdoc
${QT_SOURCE_TREE}/src/tools/qdoc/qmlparser
)
#### Keys ignored in scope 1:.:.:qdoc.pro:<TRUE>:
-# CMAKE_BIN_DIR = "join($$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX])"
-# CMAKE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_LIBS])"
-# CMAKE_LIB_DIR = "join($$[QT_INSTALL_LIBS],$$[QT_INSTALL_PREFIX])"
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
+# CMAKE_INSTALL_LIBS_DIR = "$$cmakeTargetPath($$[QT_INSTALL_LIBS])"
+# CMAKE_LIB_DIR = "$$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])"
# CMAKE_PACKAGE_VERSION = "$$MODULE_VERSION"
# INSTALLS = "cmake_qdoc_tools_files"
# QMAKE_SUBSTITUTES = "cmake_qdoc_config_file" "cmake_qdoc_config_version_file"
@@ -74,6 +74,9 @@ add_qt_tool(qdoc
## Scopes:
#####################################################################
+#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
+# _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
+
extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
LIBRARIES
Qt::QmlDevToolsPrivate
@@ -99,7 +102,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 9:.:.:qdoc.pro:NOT CMAKE_LIB_DIR___contains___^\\.\\./._x_:
# CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
-# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_PREFIX],$$[QT_INSTALL_LIBS])"
+# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "$$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])"
#### Keys ignored in scope 10:.:.:qdoc.pro:else:
# CMAKE_LIB_DIR_IS_ABSOLUTE = "True"
@@ -107,7 +110,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-add_qt_docs(
+add_qt_docs(qdoc
doc/config/qdoc.qdocconf
)
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt
index 5c3dabd87..8a4630158 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -4,7 +4,6 @@
## qdoc Tool:
#####################################################################
-
add_qt_tool(qdoc
SOURCES
atom.cpp atom.h
@@ -48,18 +47,18 @@ add_qt_tool(qdoc
LIBRARIES # special case
WrapLibClang::WrapLibClang # special case
DEFINES
+ #(CLANG_RESOURCE_DIR=\"/clang//include\") # special case remove
+ CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR} # special case
QDOC2_COMPAT
- # join(CLANG_RESOURCE_DIR=\"/clang//include\") # special case remove
- CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR}
INCLUDE_DIRECTORIES
${QT_SOURCE_TREE}/src/tools/qdoc
${QT_SOURCE_TREE}/src/tools/qdoc/qmlparser
)
#### Keys ignored in scope 1:.:.:qdoc.pro:<TRUE>:
-# CMAKE_BIN_DIR = "join($$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX])"
-# CMAKE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_LIBS])"
-# CMAKE_LIB_DIR = "join($$[QT_INSTALL_LIBS],$$[QT_INSTALL_PREFIX])"
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
+# CMAKE_INSTALL_LIBS_DIR = "$$cmakeTargetPath($$[QT_INSTALL_LIBS])"
+# CMAKE_LIB_DIR = "$$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])"
# CMAKE_PACKAGE_VERSION = "$$MODULE_VERSION"
# INSTALLS = "cmake_qdoc_tools_files"
# QMAKE_SUBSTITUTES = "cmake_qdoc_config_file" "cmake_qdoc_config_version_file"
@@ -78,6 +77,9 @@ add_qt_tool(qdoc
## Scopes:
#####################################################################
+#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
+# _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
+
extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
LIBRARIES
Qt::QmlDevToolsPrivate
@@ -103,7 +105,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 9:.:.:qdoc.pro:NOT CMAKE_LIB_DIR___contains___^\\.\\./._x_:
# CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
-# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_PREFIX],$$[QT_INSTALL_LIBS])"
+# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "$$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])"
#### Keys ignored in scope 10:.:.:qdoc.pro:else:
# CMAKE_LIB_DIR_IS_ABSOLUTE = "True"
@@ -111,7 +113,7 @@ extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-add_qt_docs(
+add_qt_docs(qdoc
doc/config/qdoc.qdocconf
)
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt
index 019c860a0..bbc8808b2 100644
--- a/src/qtattributionsscanner/CMakeLists.txt
+++ b/src/qtattributionsscanner/CMakeLists.txt
@@ -21,9 +21,9 @@ add_qt_tool(qtattributionsscanner
)
#### Keys ignored in scope 1:.:.:qtattributionsscanner.pro:<TRUE>:
-# CMAKE_BIN_DIR = "join($$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX])"
-# CMAKE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_LIBS])"
-# CMAKE_LIB_DIR = "join($$[QT_INSTALL_LIBS],$$[QT_INSTALL_PREFIX])"
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
+# CMAKE_INSTALL_LIBS_DIR = "$$cmakeTargetPath($$[QT_INSTALL_LIBS])"
+# CMAKE_LIB_DIR = "$$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])"
# CMAKE_PACKAGE_VERSION = "$$MODULE_VERSION"
# INSTALLS = "cmake_qattributionsscanner_tools_files"
# QMAKE_SUBSTITUTES = "cmake_qattributionsscanner_config_file" "cmake_qattributionsscanner_config_version_file"
@@ -46,7 +46,7 @@ add_qt_tool(qtattributionsscanner
#### Keys ignored in scope 3:.:.:qtattributionsscanner.pro:NOT CMAKE_LIB_DIR___contains___^\\.\\./._x_:
# CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
-# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "join($$[QT_INSTALL_PREFIX],$$[QT_INSTALL_LIBS])"
+# CMAKE_RELATIVE_INSTALL_LIBS_DIR = "$$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])"
#### Keys ignored in scope 4:.:.:qtattributionsscanner.pro:else:
# CMAKE_LIB_DIR_IS_ABSOLUTE = "True"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 13:26:21 +0000