summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2018-01-09 13:42:06 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2018-01-11 10:24:25 +0000
commit57e27915f444c95e845b3b2790e2e97fde4c465c (patch)
tree6f24b4253e96e31e66c55c43c1b2351ee47e4746
parent32786ea9cadb4329b09dae2f825e61dcbd9fcc75 (diff)
downloadqt-creator-57e27915f444c95e845b3b2790e2e97fde4c465c.tar.gz
Fix includes
The missing headers were included indirectly through the QHeaderView, QButtonGroup or QAction inside the generated ui files. Now, the generated ui files won't include QHeaderView, QButtonGroup nor QAction, so we need to include the missing headers explicitly. Change-Id: Ife6c4e2c39b2b2b7d8365cc5ae2dbb6de4b3ac66 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidgetimage.cpp1
-rw-r--r--src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp1
-rw-r--r--src/plugins/coreplugin/find/findtoolbar.cpp1
-rw-r--r--src/plugins/macros/macrooptionswidget.cpp1
-rw-r--r--src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp2
-rw-r--r--src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp1
6 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index 188e19ae7d..e503c1078c 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -37,6 +37,7 @@
#include <QMouseEvent>
#include <QScrollArea>
#include <QSlider>
+#include <QStyle>
#include <QToolButton>
#include <QDebug>
diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
index 2b7b054a8d..15039e5d7a 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -37,6 +37,7 @@
#include <utils/hostosinfo.h>
#include <utils/stringutils.h>
+#include <QButtonGroup>
#include <QDir>
#include <QFileInfo>
#include <QMap>
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 8b9016d8f2..f376bc702c 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -47,6 +47,7 @@
#include <QDebug>
#include <QSettings>
+#include <QAbstractItemView>
#include <QCheckBox>
#include <QClipboard>
#include <QCompleter>
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index a55849d50b..b49d6eeab0 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -35,6 +35,7 @@
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
+#include <QAction>
#include <QDir>
#include <QFileInfo>
#include <QTreeWidget>
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
index c791e8ac80..fdac2ab230 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp
@@ -31,6 +31,8 @@
#include <utils/portlist.h>
#include <utils/qtcassert.h>
+#include <QRegExpValidator>
+
using namespace ProjectExplorer::Constants;
namespace ProjectExplorer {
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
index 83a25c9c38..6ea510db4a 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
+++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp
@@ -34,6 +34,7 @@
#include <QClipboard>
#include <QIcon>
#include <QSettings>
+#include <QStyle>
static const char SettingsApplication[] = "QtCreator";
static const char SettingsKeySkipWarningAbortingBacktrace[]