Adapt to various upstream changesv12.0.0-beta1

- plugin json uses cmake style
- app_version is replaced by Q(Core|Gui)Application properties
- session moved to Core
- settings pages are no QObjects anymore

Change-Id: I36ee689e75f9db10c6de688f14559fb9d88d7381
Reviewed-by: hjk <hjk@qt.io>

9 files changed, 49 insertions, 39 deletions

diff --git a/src/UsageStatistic.json.in b/src/UsageStatistic.json.in
index 1e3a2c1..fa0bc18 100644
--- a/src/UsageStatistic.json.in
+++ b/src/UsageStatistic.json.in
@@ -1,11 +1,11 @@
 {
-    \"Name\" : \"UsageStatistic\",
-    \"Version\" : \"$$QTCREATOR_VERSION\",
-    \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
-    \"Vendor\" : \"The Qt Company Ltd\",
-    \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\",
-    \"License\" : \"GNU GPL v3\",
-    \"Description\" : \"This plugin collects statistics on how Qt Creator is used. All statistics are pseudonymous. You can switch off the plugin any time you want.\",
-    \"Url\" : \"https://www.qt.io/\",
-    $$dependencyList
+    "Name" : "UsageStatistic",
+    "Version" : "${IDE_VERSION}",
+    "CompatVersion" : "${IDE_VERSION_COMPAT}",
+    "Vendor" : "The Qt Company Ltd",
+    "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
+    "License" : "GNU GPL v3",
+    "Description" : "This plugin collects statistics on how Qt Creator is used. All statistics are pseudonymous. You can switch off the plugin any time you want.",
+    "Url" : "https://www.qt.io/",
+    ${IDE_PLUGIN_DEPENDENCIES}
 }
diff --git a/src/datasources/applicationsource.cpp b/src/datasources/applicationsource.cpp
index 57bf542..c1a872f 100644
--- a/src/datasources/applicationsource.cpp
+++ b/src/datasources/applicationsource.cpp
@@ -3,13 +3,13 @@
 
 #include "applicationsource.h"
 
-#include <app/app_version.h>
 #include <coreplugin/coreconstants.h>
 
 #include "common/scopedsettingsgroupsetter.h"
 #include "common/utils.h"
 
-#include <QtCore/QSettings>
+#include <QGuiApplication>
+#include <QSettings>
 
 namespace UsageStatistic {
 namespace Internal {
@@ -33,8 +33,8 @@ QString ApplicationSource::description() const
 QVariant ApplicationSource::data()
 {
     return QVariantMap{
-        {"applicationName", Core::Constants::IDE_DISPLAY_NAME},
-        {"applicationVersion", Core::Constants::IDE_VERSION_LONG},
+        {"applicationName", QGuiApplication::applicationDisplayName()},
+        {"applicationVersion", QGuiApplication::applicationVersion()},
 
     };
 }
diff --git a/src/datasources/buildsystemsource.cpp b/src/datasources/buildsystemsource.cpp
index ddb4a50..150980e 100644
--- a/src/datasources/buildsystemsource.cpp
+++ b/src/datasources/buildsystemsource.cpp
@@ -27,9 +27,9 @@
 #include <QtCore/QSettings>
 #include <QtCore/QCryptographicHash>
 
+#include <coreplugin/session.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
-#include <projectexplorer/session.h>
 
 #include <KUserFeedback/Provider>
 
@@ -72,9 +72,10 @@ BuildSystemSource::BuildSystemSource()
             this,
             &BuildSystemSource::updateProjects);
 
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::sessionLoaded,
-            this, &BuildSystemSource::updateProjects);
+    connect(Core::SessionManager::instance(),
+            &Core::SessionManager::sessionLoaded,
+            this,
+            &BuildSystemSource::updateProjects);
 }
 
 BuildSystemSource::~BuildSystemSource() = default;
diff --git a/src/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp
index 1073555..2fe52db 100644
--- a/src/datasources/examplesdatasource.cpp
+++ b/src/datasources/examplesdatasource.cpp
@@ -27,9 +27,9 @@
 #include <QtCore/QSettings>
 #include <QtCore/QRegularExpression>
 
+#include <coreplugin/session.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
-#include <projectexplorer/session.h>
 
 #include <common/scopedsettingsgroupsetter.h>
 
@@ -51,8 +51,8 @@ ExamplesDataSource::ExamplesDataSource()
             this,
             &ExamplesDataSource::updateOpenedExamples);
 
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::sessionLoaded,
+    connect(Core::SessionManager::instance(),
+            &Core::SessionManager::sessionLoaded,
             this,
             &ExamplesDataSource::updateOpenedExamples);
 }
diff --git a/src/datasources/kitsource.cpp b/src/datasources/kitsource.cpp
index 7c01bfa..5037357 100644
--- a/src/datasources/kitsource.cpp
+++ b/src/datasources/kitsource.cpp
@@ -28,17 +28,17 @@
 
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/gcctoolchain.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitaspects.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
-#include <debugger/debuggerkitinformation.h>
 #include <debugger/debuggeritem.h>
+#include <debugger/debuggerkitaspect.h>
 
 #include "common/scopedsettingsgroupsetter.h"
 
diff --git a/src/datasources/kitsource.h b/src/datasources/kitsource.h
index c42e3fe..38afd09 100644
--- a/src/datasources/kitsource.h
+++ b/src/datasources/kitsource.h
@@ -83,9 +83,9 @@ public: // AbstractDataSource interface
     QVariant data() override;
 
 private:
-    void loadImpl(QSettings *settings);
-    void storeImpl(QSettings *settings);
-    void resetImpl(QSettings *settings);
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
     friend class KitInfo;
     QVariantMap m_buildSuccessesForToolChain;
diff --git a/src/ui/usagestatisticpage.cpp b/src/ui/usagestatisticpage.cpp
index c3c6558..d86fddf 100644
--- a/src/ui/usagestatisticpage.cpp
+++ b/src/ui/usagestatisticpage.cpp
@@ -29,6 +29,8 @@
 #include "usagestatisticwidget.h"
 #include "usagestatisticconstants.h"
 
+#include <utils/theme/theme.h>
+
 namespace UsageStatistic {
 namespace Internal {
 
@@ -70,7 +72,7 @@ void UsageStatisticPage::apply()
     m_provider->setTelemetryMode(settings.telemetryMode);
     applyDataSourcesActiveStatuses(settings.activeStatusesById, *m_provider);
 
-    Q_EMIT settingsChanged();
+    Q_EMIT m_signals.settingsChanged();
 }
 
 void UsageStatisticPage::finish()
@@ -82,8 +84,7 @@ void UsageStatisticPage::configure()
 {
     setId(Constants::USAGE_STATISTIC_PAGE_ID);
     setCategory(Constants::TELEMETRY_SETTINGS_CATEGORY_ID);
-    setCategoryIcon(Utils::Icon({{":/usagestatistic/images/settingscategory_usagestatistic.png",
-                    Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint));
+    setCategoryIconPath(":/usagestatistic/images/settingscategory_usagestatistic.png");
 
     setDisplayName(tr("Usage Statistics"));
     setDisplayCategory(tr("Telemetry"));
diff --git a/src/ui/usagestatisticpage.h b/src/ui/usagestatisticpage.h
index 1052611..9c811b1 100644
--- a/src/ui/usagestatisticpage.h
+++ b/src/ui/usagestatisticpage.h
@@ -37,11 +37,17 @@ namespace Internal {
 
 class UsageStatisticWidget;
 
-//! Settings page
-class UsageStatisticPage : public Core::IOptionsPage
+class SettingsSignals : public QObject
 {
     Q_OBJECT
+signals:
+    void settingsChanged();
+};
 
+//! Settings page
+class UsageStatisticPage : public Core::IOptionsPage
+{
+    Q_DECLARE_TR_FUNCTIONS(UsageStatistic::Internal::UsageStatisticPage)
 public:
     UsageStatisticPage(std::shared_ptr<KUserFeedback::Provider> provider);
     ~UsageStatisticPage() override;
@@ -51,12 +57,12 @@ public: // IOptionsPage interface
     void apply() override;
     void finish() override;
 
-Q_SIGNALS:
-    void settingsChanged();
+    SettingsSignals *instance() { return &m_signals; }
 
 private: // Data
     std::unique_ptr<UsageStatisticWidget> m_feedbackWidget;
     std::shared_ptr<KUserFeedback::Provider> m_provider;
+    SettingsSignals m_signals;
 
 private: // Methods
     void configure();
diff --git a/src/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp
index aa8ce90..992e4b1 100644
--- a/src/usagestatisticplugin.cpp
+++ b/src/usagestatisticplugin.cpp
@@ -25,8 +25,6 @@
 #include "usagestatisticplugin.h"
 #include "usagestatisticconstants.h"
 
-#include <app/app_version.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -49,7 +47,7 @@
 #include <KUserFeedback/UsageTimeSource>
 #include <KUserFeedback/StyleInfoSource>
 
-#include "datasources/applicationsource.h".h "
+#include "datasources/applicationsource.h"
 #include "datasources/buildcountsource.h"
 #include "datasources/buildsystemsource.h"
 #include "datasources/examplesdatasource.h"
@@ -66,6 +64,8 @@
 
 #include "common/utils.h"
 
+#include <QGuiApplication>
+
 namespace UsageStatistic {
 namespace Internal {
 
@@ -151,8 +151,10 @@ void UsageStatisticPlugin::createUsageStatisticPage()
 {
     m_usageStatisticPage = std::make_unique<UsageStatisticPage>(m_provider);
 
-    connect(m_usageStatisticPage.get(), &UsageStatisticPage::settingsChanged,
-            this, &UsageStatisticPlugin::storeSettings);
+    connect(m_usageStatisticPage->instance(),
+            &SettingsSignals::settingsChanged,
+            this,
+            &UsageStatisticPlugin::storeSettings);
 }
 
 void UsageStatisticPlugin::storeSettings()
@@ -220,7 +222,7 @@ static ::Utils::InfoBarEntry makeInfoBarEntry()
 {
     static auto infoText = UsageStatisticPlugin::tr(
                                "We make %1 for you. Would you like to help us make it even better?")
-                               .arg(Core::Constants::IDE_DISPLAY_NAME);
+                               .arg(QGuiApplication::applicationDisplayName());
     static auto customButtonInfoText = UsageStatisticPlugin::tr("Adjust usage statistics settings");
     static auto cancelButtonInfoText = UsageStatisticPlugin::tr("Decide later");