diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-10-13 10:46:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-10-13 10:46:46 +0200 |
| commit | fe22a6f62b25f7e50df61d0923f42e63f6bdfa0a (patch) | |
| tree | 07b38ee4faf6620c608aff066d71912d0f4c4c14 | |
| parent | 1ddbd0aff20b0b0524b116448af21b9d1f71cb18 (diff) | |
| parent | d82b8d0d36ae29e49fbb6b420410cbf71748387f (diff) | |
Merge remote-tracking branch 'origin/11.0' into 12.0v12.0.1v12.0.0-rc1v12.0.0-beta2v12.0.0
Conflicts:
src/datasources/buildsystemsource.cpp
src/datasources/examplesdatasource.cpp
Change-Id: I02f354c281aae91bfc71042e00003f492acf9f5c
| -rw-r--r-- | src/datasources/buildsystemsource.cpp | 1 | ||||
| -rw-r--r-- | src/datasources/examplesdatasource.cpp | 1 | ||||
| -rw-r--r-- | src/ui/usagestatisticpage.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/datasources/buildsystemsource.cpp b/src/datasources/buildsystemsource.cpp index 150980e..f04978b 100644 --- a/src/datasources/buildsystemsource.cpp +++ b/src/datasources/buildsystemsource.cpp @@ -28,6 +28,7 @@ #include <QtCore/QCryptographicHash> #include <coreplugin/session.h> + #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> diff --git a/src/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp index 2fe52db..807b9f0 100644 --- a/src/datasources/examplesdatasource.cpp +++ b/src/datasources/examplesdatasource.cpp @@ -28,6 +28,7 @@ #include <QtCore/QRegularExpression> #include <coreplugin/session.h> + #include <projectexplorer/project.h> #include <projectexplorer/projectmanager.h> diff --git a/src/ui/usagestatisticpage.h b/src/ui/usagestatisticpage.h index 9c811b1..84d25d8 100644 --- a/src/ui/usagestatisticpage.h +++ b/src/ui/usagestatisticpage.h @@ -45,7 +45,7 @@ signals: }; //! Settings page -class UsageStatisticPage : public Core::IOptionsPage +class UsageStatisticPage : public QObject, Core::IOptionsPage { Q_DECLARE_TR_FUNCTIONS(UsageStatistic::Internal::UsageStatisticPage) public: |