Merge remote-tracking branch 'origin/4.5' into 4.6

Change-Id: I88e4d82b9453274fa2575332aa465cb965e20808
This commit is contained in:
Eike Ziller
2018-01-11 14:34:52 +01:00
6 changed files with 7 additions and 0 deletions

View File

@@ -37,6 +37,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QScrollArea> #include <QScrollArea>
#include <QSlider> #include <QSlider>
#include <QStyle>
#include <QToolButton> #include <QToolButton>
#include <QDebug> #include <QDebug>

View File

@@ -37,6 +37,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <QButtonGroup>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QMap> #include <QMap>

View File

@@ -45,6 +45,7 @@
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
#include <QAbstractItemView>
#include <QCheckBox> #include <QCheckBox>
#include <QClipboard> #include <QClipboard>
#include <QCompleter> #include <QCompleter>

View File

@@ -35,6 +35,7 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h> #include <coreplugin/id.h>
#include <QAction>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QTreeWidget> #include <QTreeWidget>

View File

@@ -31,6 +31,8 @@
#include <utils/portlist.h> #include <utils/portlist.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QRegExpValidator>
using namespace ProjectExplorer::Constants; using namespace ProjectExplorer::Constants;
namespace ProjectExplorer { namespace ProjectExplorer {

View File

@@ -34,6 +34,7 @@
#include <QClipboard> #include <QClipboard>
#include <QIcon> #include <QIcon>
#include <QSettings> #include <QSettings>
#include <QStyle>
static const char SettingsApplication[] = "QtCreator"; static const char SettingsApplication[] = "QtCreator";
static const char SettingsKeySkipWarningAbortingBacktrace[] static const char SettingsKeySkipWarningAbortingBacktrace[]