summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/tools/moc/.prev_CMakeLists.txt1
-rw-r--r--src/tools/moc/CMakeLists.txt1
-rw-r--r--src/tools/qdbuscpp2xml/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qdbuscpp2xml/CMakeLists.txt1
-rw-r--r--src/tools/qdbusxml2cpp/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qdbusxml2cpp/CMakeLists.txt1
-rw-r--r--src/tools/qlalr/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qlalr/CMakeLists.txt1
-rw-r--r--src/tools/qvkgen/.prev_CMakeLists.txt1
-rw-r--r--src/tools/qvkgen/CMakeLists.txt1
-rw-r--r--src/tools/rcc/.prev_CMakeLists.txt1
-rw-r--r--src/tools/rcc/CMakeLists.txt1
-rw-r--r--src/tools/uic/.prev_CMakeLists.txt1
-rw-r--r--src/tools/uic/CMakeLists.txt1
-rwxr-xr-xutil/cmake/pro2cmake.py19
15 files changed, 32 insertions, 1 deletions
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index ffadd2e2be..c33087046b 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
qt_add_tool(moc
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Meta Object Compiler"
SOURCES
cbordevice.h
collectjson.cpp collectjson.h
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index c9786674f1..e21719d7f8 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -6,6 +6,7 @@
qt_add_tool(moc
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Meta Object Compiler"
TOOLS_TARGET Core # special case
SOURCES
cbordevice.h
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index 58a8ea2b08..27e61681c2 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qdbuscpp2xml
+ TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler"
SOURCES
../moc/cbordevice.h
../moc/collectjson.cpp ../moc/collectjson.h
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 46582793a1..de4f0f59bb 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qdbuscpp2xml
+ TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler"
TOOLS_TARGET DBus # special case
SOURCES
../moc/cbordevice.h
diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
index ce9438b207..28a36410d9 100644
--- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qdbusxml2cpp
+ TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler"
SOURCES
qdbusxml2cpp.cpp
DEFINES
diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt
index 63700f0b6b..6380871819 100644
--- a/src/tools/qdbusxml2cpp/CMakeLists.txt
+++ b/src/tools/qdbusxml2cpp/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qdbusxml2cpp
+ TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler"
TOOLS_TARGET DBus # special case
SOURCES
qdbusxml2cpp.cpp
diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt
index 9ff8a54ce4..c933cde1b4 100644
--- a/src/tools/qlalr/.prev_CMakeLists.txt
+++ b/src/tools/qlalr/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qlalr
+ TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator"
SOURCES
compress.cpp compress.h
cppgenerator.cpp cppgenerator.h
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
index 437c8d918f..bf13e6f492 100644
--- a/src/tools/qlalr/CMakeLists.txt
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qlalr
+ TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator"
TOOLS_TARGET Core # special case
SOURCES
compress.cpp compress.h
diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt
index 994b97a9f1..a4a12354f6 100644
--- a/src/tools/qvkgen/.prev_CMakeLists.txt
+++ b/src/tools/qvkgen/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qvkgen
+ TARGET_DESCRIPTION "Qt Vulkan Header Generator"
SOURCES
qvkgen.cpp
PUBLIC_LIBRARIES
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
index 0f72a8b633..34c1c57d7c 100644
--- a/src/tools/qvkgen/CMakeLists.txt
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(qvkgen
+ TARGET_DESCRIPTION "Qt Vulkan Header Generator"
TOOLS_TARGET Gui # special case
SOURCES
qvkgen.cpp
diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt
index 307f08bfa7..76bacbdffb 100644
--- a/src/tools/rcc/.prev_CMakeLists.txt
+++ b/src/tools/rcc/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
qt_add_tool(rcc
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Resource Compiler"
SOURCES
main.cpp
rcc.cpp rcc.h
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index e7f45314c3..6136545a3e 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -6,6 +6,7 @@
qt_add_tool(rcc
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Resource Compiler"
TOOLS_TARGET Core # special case
SOURCES
main.cpp
diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt
index 4cd28d7070..76c9bac287 100644
--- a/src/tools/uic/.prev_CMakeLists.txt
+++ b/src/tools/uic/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(uic
+ TARGET_DESCRIPTION "Qt User Interface Compiler"
SOURCES
cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 21fd232349..d6b45432bc 100644
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
qt_add_tool(uic
+ TARGET_DESCRIPTION "Qt User Interface Compiler"
TOOLS_TARGET Widgets # special case
SOURCES
cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 1764868715..cd43e2957e 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -3049,6 +3049,19 @@ def write_generic_library(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> s
return target_name
+def forward_target_info(scope: Scope, extra: [str]):
+ s = scope.get_string("QMAKE_TARGET_PRODUCT")
+ if s:
+ extra.append(f"TARGET_PRODUCT \"{s}\"")
+ s = scope.get_string("QMAKE_TARGET_DESCRIPTION")
+ if s:
+ extra.append(f"TARGET_DESCRIPTION \"{s}\"")
+ s = scope.get_string("QMAKE_TARGET_COMPANY")
+ if s:
+ extra.append(f"TARGET_COMPANY \"{s}\"")
+ s = scope.get_string("QMAKE_TARGET_COPYRIGHT")
+ if s:
+ extra.append(f"TARGET_COPYRIGHT \"{s}\"")
def write_module(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
module_name = scope.TARGET
@@ -3092,6 +3105,7 @@ def write_module(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
scope._is_public_module = is_public_module
target_name = module_name[2:]
+ forward_target_info(scope, extra)
write_main_part(
cm_fh,
target_name,
@@ -3124,6 +3138,8 @@ def write_tool(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
else:
extra = []
+ forward_target_info(scope, extra)
+
write_main_part(
cm_fh,
tool_name,
@@ -3178,7 +3194,6 @@ def write_test(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int =
return test_name
-
def write_binary(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int = 0) -> str:
binary_name = scope.TARGET
assert binary_name
@@ -3552,6 +3567,8 @@ def write_plugin(cm_fh, scope, *, indent: int = 0) -> str:
if "static" in scope.get("CONFIG"):
extra.append("STATIC")
+ forward_target_info(scope, extra)
+
write_main_part(
cm_fh,
plugin_name,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 12:56:57 +0000