From 304e24ac76e791425f5bfde9ac20dcd277aad471 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Tue, 18 Jul 2017 14:13:29 +0200
Subject: [PATCH] Win: Set proper descriptions for tools
This is shown in the file properties and in crash dialogs. Because
of the latter, a short name is better than a description, otherwise
you get dialogs like
Tool for viewing on-line documentation in Qt help file format
has stopped working.
Task-number: QTBUG-61970
Change-Id: I9289fe9546a6d9056bbfddb2b6c0bb0ae94684c2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
src/assistant/assistant/assistant.pro | 2 +-
src/assistant/qcollectiongenerator/qcollectiongenerator.pro | 1 +
src/assistant/qhelpgenerator/qhelpgenerator.pro | 1 +
src/designer/src/designer/designer.pro | 2 +-
src/linguist/lconvert/lconvert.pro | 1 +
src/linguist/linguist/linguist.pro | 2 +-
src/linguist/lrelease/lrelease.pro | 1 +
src/linguist/lupdate/lupdate.pro | 1 +
src/qdoc/qdoc.pro | 1 +
src/qtattributionsscanner/qtattributionsscanner.pro | 1 +
src/windeployqt/windeployqt.pro | 1 +
src/winrtrunner/winrtrunner.pro | 1 +
12 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 82f55092c..73931769e 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -103,7 +103,7 @@ RESOURCES += assistant.qrc \
assistant_images.qrc
QMAKE_TARGET_PRODUCT = Qt Assistant
-QMAKE_TARGET_DESCRIPTION = Tool for viewing on-line documentation in Qt help file format
+QMAKE_TARGET_DESCRIPTION = Qt Assistant
win32 {
LIBS += -lshell32
diff --git a/src/assistant/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
index 608fca6bc..cf9b9a257 100644
--- a/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
@@ -7,4 +7,5 @@ HEADERS += ../shared/helpgenerator.h \
../shared/collectionconfiguration.h
QTPLUGIN.platforms = qminimal
+QMAKE_TARGET_DESCRIPTION = "Qt Help Collection File Generator"
load(qt_tool)
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index a7ec6f00a..d4e84a74f 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -7,4 +7,5 @@ SOURCES += ../shared/helpgenerator.cpp \
HEADERS += ../shared/helpgenerator.h
+QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
load(qt_tool)
diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 0201ea6c2..37909c2fd 100644
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -60,7 +60,7 @@ FORMS += saveformastemplate.ui \
qdesigner_appearanceoptions.ui
QMAKE_TARGET_PRODUCT = Qt Designer
-QMAKE_TARGET_DESCRIPTION = Tool for designing and building graphical user interfaces with Qt Widgets
+QMAKE_TARGET_DESCRIPTION = Qt Designer
win32 {
RC_ICONS = designer.ico
diff --git a/src/linguist/lconvert/lconvert.pro b/src/linguist/lconvert/lconvert.pro
index e52e8d729..d1e49bc20 100644
--- a/src/linguist/lconvert/lconvert.pro
+++ b/src/linguist/lconvert/lconvert.pro
@@ -6,4 +6,5 @@ SOURCES += main.cpp
include(../shared/formats.pri)
+QMAKE_TARGET_DESCRIPTION = "Qt Translation File Converter"
load(qt_tool)
diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index c3de1c6a8..19153d716 100644
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -60,7 +60,7 @@ DEFINES += QT_KEYWORDS
TARGET = linguist
QMAKE_TARGET_PRODUCT = Qt Linguist
-QMAKE_TARGET_DESCRIPTION = Tool for adding translations to Qt applications
+QMAKE_TARGET_DESCRIPTION = Qt Linguist
win32 {
RC_ICONS = linguist.ico
diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
index df026fe48..c2416dc9a 100644
--- a/src/linguist/lrelease/lrelease.pro
+++ b/src/linguist/lrelease/lrelease.pro
@@ -11,4 +11,5 @@ qmake.name = QMAKE
qmake.value = $$shell_path($$QMAKE_QMAKE)
QT_TOOL_ENV += qmake
+QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler"
load(qt_tool)
diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 710fd9b1d..3aef95c8d 100644
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -37,4 +37,5 @@ qmake.name = QMAKE
qmake.value = $$shell_path($$QMAKE_QMAKE)
QT_TOOL_ENV += qmake
+QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool"
load(qt_tool)
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro
index 8cf4b44dd..a49ddc555 100644
--- a/src/qdoc/qdoc.pro
+++ b/src/qdoc/qdoc.pro
@@ -95,6 +95,7 @@ qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
QMAKE_DOCS = $$PWD/doc/config/qdoc.qdocconf
+QMAKE_TARGET_DESCRIPTION = "Qt Documentation Compiler"
load(qt_tool)
TR_EXCLUDE += $$PWD/*
diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro
index 827e5f5cf..c3c57b35d 100644
--- a/src/qtattributionsscanner/qtattributionsscanner.pro
+++ b/src/qtattributionsscanner/qtattributionsscanner.pro
@@ -18,4 +18,5 @@ HEADERS += \
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
+QMAKE_TARGET_DESCRIPTION = "Qt Source Code Attribution Scanner"
load(qt_tool)
diff --git a/src/windeployqt/windeployqt.pro b/src/windeployqt/windeployqt.pro
index b6c843e15..fc8c74fd5 100644
--- a/src/windeployqt/windeployqt.pro
+++ b/src/windeployqt/windeployqt.pro
@@ -9,4 +9,5 @@ CONFIG += force_bootstrap
win32: LIBS += -lshlwapi
+QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool"
load(qt_tool)
diff --git a/src/winrtrunner/winrtrunner.pro b/src/winrtrunner/winrtrunner.pro
index 21f2c8310..e633e0f0d 100644
--- a/src/winrtrunner/winrtrunner.pro
+++ b/src/winrtrunner/winrtrunner.pro
@@ -22,4 +22,5 @@ LIBS += -lruntimeobject -lwsclient -lShlwapi -lurlmon -lxmllite -lcrypt32
include(../shared/corecon/corecon.pri)
+QMAKE_TARGET_DESCRIPTION = "Qt WinRT Runner"
load(qt_tool)
--
GitLab