aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-05-28 12:41:16 +0200
committerhjk <hjk@qt.io>2018-05-28 11:00:56 +0000
commitdba5aee92dccec106e9f7edd452ba9a231db6076 (patch)
tree452a1b11e41f425aaee9c150d86310231094cb73
parente5cf97f4096b4839e0a00bae60482b31e5e08663 (diff)
Make compilable with 5.114.2
While it is understood that there won't be any further release from this 4.2 branch, it helps with bisecting Qt Creator when there isn't a need to build a contemporary Qt version as well. Change-Id: Icb722ca45f4a70b73a9a4932a103ae8e45b500a0 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 2334606aad..731b467c3c 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 88eaa2cba6..4fb93307aa 100644
--- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
@@ -36,6 +36,7 @@
#include <utils/fileutils.h>
#include <utils/hostosinfo.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 443c757e97..dc110eed84 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 524a1f5177..dcadff5eca 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[]