Merge remote-tracking branch 'origin/11.0' into qds/dev

Change-Id: Ib9889685af9d0dcfacaabc43efe54cf8f399a331

6 files changed, 44 insertions, 34 deletions

diff --git a/README.md b/README.md
index a81ffc2..7cc4026 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Qt Creator Telemetry Plugin
 
 The plugin is used in Qt Creator and Qt Design Studio to send telemetry data.
-It is based on [KUserFeedback](https://api.kde.org/frameworks-api/frameworks-apidocs/frameworks/kuserfeedback/html/index.html).
+It is based on [KUserFeedback](https://api.kde.org/frameworks/kuserfeedback/html).
 
 # Checking out sources
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94167a6..4d81f2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,14 +7,14 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 17)
 
+find_package(Qt6 COMPONENTS Widgets QuickWidgets REQUIRED)
 find_package(QtCreator COMPONENTS Core TextEditor ProjectExplorer VcsBase REQUIRED)
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
 find_package(KUserFeedback REQUIRED)
 
 add_qtc_plugin(UsageStatistic
     PLUGIN_DEPENDS
         QtCreator::Core QtCreator::Debugger QtCreator::ProjectExplorer QtCreator::QtSupport
-    DEPENDS Qt5::Widgets Qt5::QuickWidgets QtCreator::ExtensionSystem QtCreator::Utils KUserFeedbackCore KUserFeedbackWidgets
+    DEPENDS Qt::Widgets Qt::QuickWidgets QtCreator::ExtensionSystem QtCreator::Utils KUserFeedbackCore KUserFeedbackWidgets
     SOURCES
         usagestatisticplugin.cpp
         datasources/qtclicensesource.cpp
diff --git a/src/datasources/buildsystemsource.cpp b/src/datasources/buildsystemsource.cpp
index 5b9e4bf..6366adc 100644
--- a/src/datasources/buildsystemsource.cpp
+++ b/src/datasources/buildsystemsource.cpp
@@ -27,8 +27,10 @@
 #include <QtCore/QSettings>
 #include <QtCore/QCryptographicHash>
 
+#include <coreplugin/session.h>
+
 #include <projectexplorer/project.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectmanager.h>
 
 #include <KUserFeedback/Provider>
 
@@ -66,12 +68,13 @@ static BuildSystemSource::BuildSystem extractBuildSystemType(const QString &name
 BuildSystemSource::BuildSystemSource()
     : AbstractDataSource(QStringLiteral("buildSystem"), Provider::DetailedUsageStatistics)
 {
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::projectAdded,
-            this, &BuildSystemSource::updateProjects);
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::projectAdded,
+            this,
+            &BuildSystemSource::updateProjects);
 
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::sessionLoaded,
+    connect(Core::SessionManager::instance(),
+            &Core::SessionManager::sessionLoaded,
             this, &BuildSystemSource::updateProjects);
 }
 
@@ -149,7 +152,7 @@ static QByteArray hashPath(const Utils::FilePath& name)
 
 void BuildSystemSource::updateProjects()
 {
-    for (auto project : ProjectExplorer::SessionManager::projects()) {
+    for (auto project : ProjectExplorer::ProjectManager::projects()) {
         if (project) {
             const auto projectName = QString::fromUtf8(project->id().name()).toLower();
             const auto projectPath = project->projectFilePath();
diff --git a/src/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp
index 0682e7b..807b9f0 100644
--- a/src/datasources/examplesdatasource.cpp
+++ b/src/datasources/examplesdatasource.cpp
@@ -27,8 +27,10 @@
 #include <QtCore/QSettings>
 #include <QtCore/QRegularExpression>
 
+#include <coreplugin/session.h>
+
 #include <projectexplorer/project.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectmanager.h>
 
 #include <common/scopedsettingsgroupsetter.h>
 
@@ -40,17 +42,20 @@ using namespace KUserFeedback;
 ExamplesDataSource::ExamplesDataSource()
     : AbstractDataSource(QStringLiteral("examplesData"), Provider::DetailedUsageStatistics)
 {
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::startupProjectChanged,
-            this, &ExamplesDataSource::updateOpenedExamples);
-
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::projectAdded,
-            this, &ExamplesDataSource::updateOpenedExamples);
-
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::sessionLoaded,
-            this, &ExamplesDataSource::updateOpenedExamples);
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::startupProjectChanged,
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
+
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::projectAdded,
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
+
+    connect(Core::SessionManager::instance(),
+            &Core::SessionManager::sessionLoaded,
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
 }
 
 ExamplesDataSource::~ExamplesDataSource() = default;
@@ -102,7 +107,7 @@ static QString examplePattern()
 void ExamplesDataSource::updateOpenedExamples()
 {
     QRegularExpression re(examplePattern().arg(examplePathGroupName()));
-    for (auto project : ProjectExplorer::SessionManager::projects()) {
+    for (auto project : ProjectExplorer::ProjectManager::projects()) {
         if (project) {
             auto projectPath = QDir::fromNativeSeparators(project->projectFilePath().toString());
             const auto match = re.match(projectPath);
diff --git a/src/datasources/kitsource.cpp b/src/datasources/kitsource.cpp
index 6cf724e..7c01bfa 100644
--- a/src/datasources/kitsource.cpp
+++ b/src/datasources/kitsource.cpp
@@ -32,7 +32,7 @@
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -54,15 +54,17 @@ KitSource::KitSource()
     QObject::connect(ProjectExplorer::BuildManager::instance(),
                      &ProjectExplorer::BuildManager::buildQueueFinished,
                      [&](bool success) {
-        const Project *project = SessionManager::startupProject();
-        const Target *target = project ? project->activeTarget() : nullptr;
-        const Kit *kit = target ? target->kit() : nullptr;
-        const ToolChain *toolChain = ToolChainKitAspect::toolChain(kit, Constants::CXX_LANGUAGE_ID);
-        const Abi abi = toolChain ? toolChain->targetAbi() : Abi();
-        const QString abiName = abi.toString();
-        QVariantMap &bucket = success ? m_buildSuccessesForToolChain : m_buildFailsForToolChain;
-        bucket[abiName] = bucket.value(abiName, 0).toInt() + 1;
-    });
+                         const Project *project = ProjectManager::startupProject();
+                         const Target *target = project ? project->activeTarget() : nullptr;
+                         const Kit *kit = target ? target->kit() : nullptr;
+                         const ToolChain *toolChain = ToolChainKitAspect::toolChain(
+                             kit, Constants::CXX_LANGUAGE_ID);
+                         const Abi abi = toolChain ? toolChain->targetAbi() : Abi();
+                         const QString abiName = abi.toString();
+                         QVariantMap &bucket = success ? m_buildSuccessesForToolChain
+                                                       : m_buildFailsForToolChain;
+                         bucket[abiName] = bucket.value(abiName, 0).toInt() + 1;
+                     });
 }
 
 KitSource::~KitSource() = default;
diff --git a/src/ui/usagestatisticpage.h b/src/ui/usagestatisticpage.h
index 1052611..dc78ac3 100644
--- a/src/ui/usagestatisticpage.h
+++ b/src/ui/usagestatisticpage.h
@@ -38,7 +38,7 @@ namespace Internal {
 class UsageStatisticWidget;
 
 //! Settings page
-class UsageStatisticPage : public Core::IOptionsPage
+class UsageStatisticPage : public QObject, Core::IOptionsPage
 {
     Q_OBJECT