From ad68bf51e79f52c1ffa597b76edaecadafddbd06 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 17 Jul 2017 08:57:07 +0200 Subject: Add executable name to description of Qt tools (Windows) Change f046ed395a5d2c383 set the default values of VERSION and QMAKE_TARGET_DESCRIPTION for Qt tools to generic ones. The version and description is shown in the properties of the executable, but also used for crash reports. For the latter it wasn't clear anymore which tool actually crashed. The patch therefore adds the executable name to the generic description. Tools can still overwrite the description on their own. Task-number: QTBUG-61970 Change-Id: I8366db22f88f0d6575e7f482f030b3c4f05af6c5 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_tool.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/qt_tool.prf') diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index a516e5ba4b..4ba2b54623 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -12,7 +12,7 @@ CONFIG += no_launch_target isEmpty(VERSION): VERSION = $$MODULE_VERSION isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = \ - "Tool for the Qt Application Development Framework" + "Tool for the Qt Application Development Framework ($$TARGET)" load(qt_app) CONFIG += console -- cgit v1.2.3 From 79737d03bc7f8b15bd0344848d58a36a580a59ae Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 27 Jul 2017 10:29:24 +0200 Subject: Windows: Simplify generic tool description Make the tool description even simpler so that e.g. moc shows up as "Qt Moc". The 'description' is shown in various places as the mere title, so it shouldn't be too verbose. This augments change ad68bf51e7. Task-number: QTBUG-61970 Change-Id: I4b30b95a10d597a9a8a2c388c2381ea38a340be6 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_tool.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/qt_tool.prf') diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 4ba2b54623..05cb4335ab 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -11,8 +11,8 @@ CONFIG += no_launch_target isEmpty(VERSION): VERSION = $$MODULE_VERSION -isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = \ - "Tool for the Qt Application Development Framework ($$TARGET)" +isEmpty(QMAKE_TARGET_DESCRIPTION): \ + QMAKE_TARGET_DESCRIPTION = "Qt $$title($$TARGET)" load(qt_app) CONFIG += console -- cgit v1.2.3 From 6b7b37cf2e3a9bccecf6f4c03eab7ee5b9e1b255 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 27 Jul 2017 10:32:23 +0200 Subject: Windows: Automatically set metadata for all Qt apps Move the logic to set default values for VERSION, QMAKE_TARGET_DESCRIPTION to qt_app.prf. This way, a lot more executables get sane defaults. Change-Id: I8394418c118a8877cec792eddc8894397c0fbf2d Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_tool.prf | 3 --- 1 file changed, 3 deletions(-) (limited to 'mkspecs/features/qt_tool.prf') diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 05cb4335ab..a8d589f0fa 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -10,9 +10,6 @@ # CONFIG += no_launch_target -isEmpty(VERSION): VERSION = $$MODULE_VERSION -isEmpty(QMAKE_TARGET_DESCRIPTION): \ - QMAKE_TARGET_DESCRIPTION = "Qt $$title($$TARGET)" load(qt_app) CONFIG += console -- cgit v1.2.3