diff options
| author | hjk <hjk@qt.io> | 2020-06-22 09:16:14 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-06-23 07:59:46 +0000 |
| commit | fd2236a59a35a0219a49b63b1728281af961ac5c (patch) | |
| tree | 691ff60e099b1dcaebc7497c24f482f23520623f /src/plugins/projectexplorer | |
| parent | f194b92d0a24449bfb94f768cb4ca4703dd816e2 (diff) | |
More Qt 6 fixes
Task-number: QTCREATORBUG-24098
Change-Id: I1e30b49218b18f426aea6e4cd3680be513894746
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
| -rw-r--r-- | src/plugins/projectexplorer/editorconfiguration.h | 6 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index af9402a77b..59f7c4733d 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -34,9 +34,9 @@ #include <memory> -namespace Core { -class IEditor; -} +QT_BEGIN_NAMESPACE +class QTextCodec; +QT_END_NAMESPACE namespace TextEditor { class BaseTextEditor; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index c873fa8014..3bc5ce49e1 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -147,17 +147,17 @@ #include <utils/stringutils.h> #include <utils/utilsicons.h> -#include <QFileInfo> -#include <QSettings> - #include <QAction> +#include <QActionGroup> #include <QApplication> #include <QDir> #include <QFileDialog> +#include <QFileInfo> #include <QInputDialog> #include <QMenu> #include <QMessageBox> #include <QPair> +#include <QSettings> #include <QThreadPool> #include <QTimer> |