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>

2 files changed, 14 insertions, 7 deletions

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();