Merge remote-tracking branch 'origin/qds/dev'HEADv17.0.0-beta2v17.0.0-beta1master17.0

Change-Id: Ic5f6e35741eb008588aac7e8a0ef0fca8b1735f0

1 files changed, 6 insertions, 12 deletions

diff --git a/src/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp
index 78f4fbf..b5fd66c 100644
--- a/src/usagestatisticplugin.cpp
+++ b/src/usagestatisticplugin.cpp
@@ -175,9 +175,12 @@ public:
         Settings &s = theSettings();
 
         using namespace Layouting;
-        auto moreInformationLabel = new QLabel("<a "
-                                               "href=\"qthelp://org.qt-project.qtcreator/doc/"
-                                               "creator-how-to-collect-usage-statistics.html\">"
+        const QString helpUrl = ICore::isQtDesignStudio() ?
+                          QString("qtdesignstudio/doc/studio-collecting-usage-statistics.html\">")
+                        : QString("qtcreator/doc/creator-how-to-collect-usage-statistics.html\">");
+
+        auto moreInformationLabel = new QLabel("<a href=\"qthelp://org.qt-project."
+                                               + helpUrl
                                                + UsageStatisticPlugin::tr("More information")
                                                + "</a>");
         connect(moreInformationLabel, &QLabel::linkActivated, [this](const QString &link) {
@@ -247,12 +250,6 @@ UsageStatisticPlugin::~UsageStatisticPlugin() = default;
 void UsageStatisticPlugin::initialize()
 {
     setupSettingsPage();
-
-    if (Core::ICore::isQtDesignStudio()) {
-        Utils::QtcSettings *settings = Core::ICore::settings();
-        settings->setValue("lastSessionCrashed", true); // value will persist unless cleared in aboutToShutdown()
-    }
-
     theSettings().readSettings();
 }
 
@@ -274,9 +271,6 @@ ExtensionSystem::IPlugin::ShutdownFlag UsageStatisticPlugin::aboutToShutdown()
 {
     theSettings().writeSettings();
 
-    Utils::QtcSettings *settings = Core::ICore::settings();
-    settings->remove("lastSessionCrashed");
-
     return SynchronousShutdown;
 }