aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-10-06 09:24:53 +0200
committerhjk <hjk@qt.io>2023-12-21 10:26:58 +0000
commit2d63bdb975e3b0ae2c4a1d4d390ddcbe6e5f58e2 (patch)
treed27d2442a59221bc0ddb3fdba4f439d9620a89cd
parent4b28fd8883b18dbf20c613533eca414369753557 (diff)
Compile with recent Qt6
Some implicit #include <QPointer> apparently vanished in qtbase with a0d931e4822. Change-Id: I5e6c821fb0a8997c1b5767aeb7bd4007df7d501f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/libs/solutions/tasking/tasktree.cpp1
-rw-r--r--src/plugins/coreplugin/locator/commandlocator.cpp1
-rw-r--r--src/plugins/coreplugin/progressmanager/processprogress.cpp1
-rw-r--r--src/plugins/coreplugin/progressmanager/taskprogress.cpp1
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.h1
-rw-r--r--src/plugins/qmlprojectmanager/qmlproject.h2
6 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index c27d886676..49dc22082a 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -7,6 +7,7 @@
#include <QFutureWatcher>
#include <QPointer>
#include <QPromise>
+#include <QPointer>
#include <QSet>
#include <QTimer>
diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp
index e960b4df85..a9e9ab7aa5 100644
--- a/src/plugins/coreplugin/locator/commandlocator.cpp
+++ b/src/plugins/coreplugin/locator/commandlocator.cpp
@@ -8,6 +8,7 @@
#include <utils/stringutils.h>
#include <QAction>
+#include <QPointer>
using namespace Utils;
diff --git a/src/plugins/coreplugin/progressmanager/processprogress.cpp b/src/plugins/coreplugin/progressmanager/processprogress.cpp
index 9aeebf4ecf..6a82f5dde8 100644
--- a/src/plugins/coreplugin/progressmanager/processprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/processprogress.cpp
@@ -10,6 +10,7 @@
#include <utils/qtcassert.h>
#include <QFutureWatcher>
+#include <QPointer>
using namespace Utils;
diff --git a/src/plugins/coreplugin/progressmanager/taskprogress.cpp b/src/plugins/coreplugin/progressmanager/taskprogress.cpp
index 5ee5feb24a..d60fa71e12 100644
--- a/src/plugins/coreplugin/progressmanager/taskprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/taskprogress.cpp
@@ -12,6 +12,7 @@
#include <utils/qtcassert.h>
#include <QFutureWatcher>
+#include <QPointer>
#include <QTimer>
using namespace Utils;
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
index 9296addfa8..1fca2d9866 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h
@@ -17,6 +17,7 @@
#include <QLoggingCategory>
#include <QMap>
#include <QPair>
+#include <QPointer>
#include <QStringList>
#include <memory>
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 3a6d5badf7..00bea922c6 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -7,6 +7,8 @@
#include "qmlprojectmanager_global.h"
#include <projectexplorer/project.h>
+#include <QPointer>
+
namespace QmlProjectManager {
class QmlProject;