18 files changed, 21 insertions, 19 deletions
diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp
index d6e6146d75..bddf275c51 100644
--- a/src/tools/sdktool/addcmakeoperation.cpp
+++ b/src/tools/sdktool/addcmakeoperation.cpp
@@ -55,7 +55,7 @@ QString AddCMakeOperation::name() const
 
 QString AddCMakeOperation::helpText() const
 {
-    return QString("add a cmake tool to Qt Creator");
+    return QString("add a cmake tool");
 }
 
 QString AddCMakeOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp
index a39af5a71d..6ec0716491 100644
--- a/src/tools/sdktool/adddebuggeroperation.cpp
+++ b/src/tools/sdktool/adddebuggeroperation.cpp
@@ -56,7 +56,7 @@ QString AddDebuggerOperation::name() const
 
 QString AddDebuggerOperation::helpText() const
 {
-    return QLatin1String("add a debugger to Qt Creator");
+    return QLatin1String("add a debugger");
 }
 
 QString AddDebuggerOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/adddeviceoperation.cpp b/src/tools/sdktool/adddeviceoperation.cpp
index 34d0d26455..91eff774cf 100644
--- a/src/tools/sdktool/adddeviceoperation.cpp
+++ b/src/tools/sdktool/adddeviceoperation.cpp
@@ -50,7 +50,7 @@ QString AddDeviceOperation::name() const
 
 QString AddDeviceOperation::helpText() const
 {
-    return QLatin1String("add a Device to Qt Creator");
+    return QLatin1String("add a Device");
 }
 
 QString AddDeviceOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/addkeysoperation.cpp b/src/tools/sdktool/addkeysoperation.cpp
index 8fa6f46556..b7abd5aaca 100644
--- a/src/tools/sdktool/addkeysoperation.cpp
+++ b/src/tools/sdktool/addkeysoperation.cpp
@@ -34,7 +34,7 @@ QString AddKeysOperation::name() const
 
 QString AddKeysOperation::helpText() const
 {
-    return QLatin1String("add settings to Qt Creator configuration");
+    return QLatin1String("add arbitrary settings to configuration");
 }
 
 QString AddKeysOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index e46945e1a5..e5767be7e8 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -78,7 +78,7 @@ QString AddKitOperation::name() const
 
 QString AddKitOperation::helpText() const
 {
-    return QString("add a Kit to Qt Creator");
+    return QString("add a Kit");
 }
 
 QString AddKitOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp
index 0039e4217c..59a0b1b555 100644
--- a/src/tools/sdktool/addqtoperation.cpp
+++ b/src/tools/sdktool/addqtoperation.cpp
@@ -63,7 +63,7 @@ QString AddQtOperation::name() const
 
 QString AddQtOperation::helpText() const
 {
-    return QLatin1String("add a Qt version to Qt Creator");
+    return QLatin1String("add a Qt version");
 }
 
 QString AddQtOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index 60aba4558d..51f98fe555 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -61,7 +61,7 @@ QString AddToolChainOperation::name() const
 
 QString AddToolChainOperation::helpText() const
 {
-    return QString("add a tool chain to Qt Creator");
+    return QString("add a tool chain");
 }
 
 QString AddToolChainOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/findkeyoperation.cpp b/src/tools/sdktool/findkeyoperation.cpp
index 1085b20f34..58d3b31ed2 100644
--- a/src/tools/sdktool/findkeyoperation.cpp
+++ b/src/tools/sdktool/findkeyoperation.cpp
@@ -34,7 +34,7 @@ QString FindKeyOperation::name() const
 
 QString FindKeyOperation::helpText() const
 {
-    return QLatin1String("find a key in the settings of Qt Creator");
+    return QLatin1String("find a key in the settings");
 }
 
 QString FindKeyOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/findvalueoperation.cpp b/src/tools/sdktool/findvalueoperation.cpp
index e7d31892f7..e59a0fa115 100644
--- a/src/tools/sdktool/findvalueoperation.cpp
+++ b/src/tools/sdktool/findvalueoperation.cpp
@@ -34,7 +34,7 @@ QString FindValueOperation::name() const
 
 QString FindValueOperation::helpText() const
 {
-    return QLatin1String("find a value in the settings of Qt Creator");
+    return QLatin1String("find a value in the settings");
 }
 
 QString FindValueOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/getoperation.cpp b/src/tools/sdktool/getoperation.cpp
index b43346dd6f..fb15d42142 100644
--- a/src/tools/sdktool/getoperation.cpp
+++ b/src/tools/sdktool/getoperation.cpp
@@ -34,7 +34,7 @@ QString GetOperation::name() const
 
 QString GetOperation::helpText() const
 {
-    return QLatin1String("get settings from Qt Creator configuration");
+    return QLatin1String("get settings from configuration");
 }
 
 QString GetOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/main.cpp b/src/tools/sdktool/main.cpp
index 0e5b4320fa..f480543fbb 100644
--- a/src/tools/sdktool/main.cpp
+++ b/src/tools/sdktool/main.cpp
@@ -45,6 +45,8 @@
 #include "rmqtoperation.h"
 #include "rmtoolchainoperation.h"
 
+#include <app/app_version.h>
+
 #include <iostream>
 
 #include <QCoreApplication>
@@ -52,7 +54,7 @@
 
 void printHelp(const Operation *op)
 {
-    std::cout << "Qt Creator SDK setup tool." << std::endl;
+    std::cout << Core::Constants::IDE_DISPLAY_NAME << " SDK setup tool." << std::endl;
 
     std::cout << "Help for operation " << qPrintable(op->name()) << std::endl;
     std::cout << std::endl;
@@ -68,7 +70,7 @@ const QString tabular(const Operation *o)
 
 void printHelp(const QList<Operation *> &operations)
 {
-    std::cout << "Qt Creator SDK setup tool." << std::endl;
+    std::cout << Core::Constants::IDE_DISPLAY_NAME << "SDK setup tool." << std::endl;
     std::cout << "    Usage: " << qPrintable(QCoreApplication::arguments().at(0))
               << " <ARGS> <OPERATION> <OPERATION_ARGS>" << std::endl << std::endl;
     std::cout << "ARGS:" << std::endl;
diff --git a/src/tools/sdktool/rmcmakeoperation.cpp b/src/tools/sdktool/rmcmakeoperation.cpp
index dc41b748c3..2eaf84b9d0 100644
--- a/src/tools/sdktool/rmcmakeoperation.cpp
+++ b/src/tools/sdktool/rmcmakeoperation.cpp
@@ -48,7 +48,7 @@ QString RmCMakeOperation::name() const
 
 QString RmCMakeOperation::helpText() const
 {
-    return QString("remove a cmake tool from Qt Creator");
+    return QString("remove a cmake tool");
 }
 
 QString RmCMakeOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmdebuggeroperation.cpp b/src/tools/sdktool/rmdebuggeroperation.cpp
index 129947271a..8c2a6bea0d 100644
--- a/src/tools/sdktool/rmdebuggeroperation.cpp
+++ b/src/tools/sdktool/rmdebuggeroperation.cpp
@@ -53,7 +53,7 @@ QString RmDebuggerOperation::name() const
 
 QString RmDebuggerOperation::helpText() const
 {
-    return QLatin1String("remove a debugger from Qt Creator");
+    return QLatin1String("remove a debugger");
 }
 
 QString RmDebuggerOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmdeviceoperation.cpp b/src/tools/sdktool/rmdeviceoperation.cpp
index b678bb07fc..4558352ab3 100644
--- a/src/tools/sdktool/rmdeviceoperation.cpp
+++ b/src/tools/sdktool/rmdeviceoperation.cpp
@@ -39,7 +39,7 @@ QString RmDeviceOperation::name() const
 
 QString RmDeviceOperation::helpText() const
 {
-    return QLatin1String("remove a Device from Qt Creator");
+    return QLatin1String("remove a Device");
 }
 
 QString RmDeviceOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmkeysoperation.cpp b/src/tools/sdktool/rmkeysoperation.cpp
index 138506bbb8..ff1f7f8baf 100644
--- a/src/tools/sdktool/rmkeysoperation.cpp
+++ b/src/tools/sdktool/rmkeysoperation.cpp
@@ -34,7 +34,7 @@ QString RmKeysOperation::name() const
 
 QString RmKeysOperation::helpText() const
 {
-    return QLatin1String("remove settings from Qt Creator configuration");
+    return QLatin1String("remove settings from configuration");
 }
 
 QString RmKeysOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp
index caa4c2f0e0..5abfe9ecdd 100644
--- a/src/tools/sdktool/rmkitoperation.cpp
+++ b/src/tools/sdktool/rmkitoperation.cpp
@@ -57,7 +57,7 @@ QString RmKitOperation::name() const
 
 QString RmKitOperation::helpText() const
 {
-    return QString("remove a Kit from Qt Creator");
+    return QString("remove a Kit");
 }
 
 QString RmKitOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmqtoperation.cpp b/src/tools/sdktool/rmqtoperation.cpp
index 50e6e66bfe..292b8fdb3f 100644
--- a/src/tools/sdktool/rmqtoperation.cpp
+++ b/src/tools/sdktool/rmqtoperation.cpp
@@ -47,7 +47,7 @@ QString RmQtOperation::name() const
 
 QString RmQtOperation::helpText() const
 {
-    return QLatin1String("remove a Qt version from Qt Creator");
+    return QLatin1String("remove a Qt version");
 }
 
 QString RmQtOperation::argumentsHelpText() const
diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp
index bb1e8d1728..1cefe02060 100644
--- a/src/tools/sdktool/rmtoolchainoperation.cpp
+++ b/src/tools/sdktool/rmtoolchainoperation.cpp
@@ -48,7 +48,7 @@ QString RmToolChainOperation::name() const
 
 QString RmToolChainOperation::helpText() const
 {
-    return QString("remove a tool chain from Qt Creator");
+    return QString("remove a tool chain");
 }
 
 QString RmToolChainOperation::argumentsHelpText() const