Removed module names from #include directives.

Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 10:42:41 +01:00
parent 9a9ba12028
commit 3fa55b7ab9
2353 changed files with 7872 additions and 7873 deletions
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -40,10 +40,10 @@

 #include <utils/qtcassert.h>

-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
+#include <QDebug>
+#include <QTimer>
+#include <QAction>
+#include <QMenuBar>

 Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*)

--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -35,7 +35,7 @@

 #include "coreplugin/id.h"

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QMenu;
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -40,14 +40,14 @@
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QMenuBar>
+#include <QDebug>
+#include <QSettings>
+#include <QDesktopWidget>
+#include <QLabel>
+#include <QMenu>
+#include <QAction>
+#include <QShortcut>
+#include <QMenuBar>

 namespace {
    enum { warnAboutFindFailures = 0 };
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -38,8 +38,8 @@
 #include <coreplugin/actionmanager/command.h>
 #include "coreplugin/icontext.h"

-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>

 QT_BEGIN_NAMESPACE
 class QAction;
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -37,10 +37,10 @@
 #include <coreplugin/actionmanager/command_p.h>
 #include <coreplugin/icontext.h>

-#include <QtCore/QMap>
-#include <QtCore/QHash>
-#include <QtCore/QMultiHash>
-#include <QtCore/QTimer>
+#include <QMap>
+#include <QHash>
+#include <QMultiHash>
+#include <QTimer>

 QT_BEGIN_NAMESPACE
 class QLabel;
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -36,12 +36,12 @@
 #include "icontext.h"
 #include "id.h"

-#include <QtCore/QDebug>
-#include <QtCore/QTextStream>
+#include <QDebug>
+#include <QTextStream>

-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QMainWindow>
+#include <QAction>
+#include <QShortcut>
+#include <QMainWindow>

 /*!
    \class Core::Command
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -36,7 +36,7 @@
 #include <coreplugin/core_global.h>
 #include <coreplugin/id.h>

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QAction;
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -40,11 +40,11 @@

 #include <utils/proxyaction.h>

-#include <QtCore/QList>
-#include <QtCore/QMultiMap>
-#include <QtCore/QPointer>
-#include <QtCore/QMap>
-#include <QtGui/QKeySequence>
+#include <QList>
+#include <QMultiMap>
+#include <QPointer>
+#include <QMap>
+#include <QKeySequence>

 namespace Core {
 namespace Internal {
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -44,12 +44,12 @@

 #include <utils/treewidgetcolumnstretcher.h>

-#include <QtGui/QKeyEvent>
-#include <QtGui/QShortcut>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTreeWidgetItem>
-#include <QtGui/QFileDialog>
-#include <QtCore/QCoreApplication>
+#include <QKeyEvent>
+#include <QShortcut>
+#include <QHeaderView>
+#include <QTreeWidgetItem>
+#include <QFileDialog>
+#include <QCoreApplication>
 #include <QtDebug>

 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
--- a/src/plugins/coreplugin/actionmanager/commandmappings.h
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.h
@@ -35,7 +35,7 @@

 #include <coreplugin/dialogs/ioptionspage.h>

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QLineEdit;
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -42,12 +42,12 @@

 #include <utils/fileutils.h>

-#include <QtCore/QFile>
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
+#include <QFile>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QDebug>
+#include <QDateTime>

 namespace Core {
 namespace Internal {
--- a/src/plugins/coreplugin/actionmanager/commandsfile.h
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.h
@@ -33,10 +33,10 @@
 #ifndef COMMANDSFILE_H
 #define COMMANDSFILE_H

-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtGui/QKeySequence>
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QKeySequence>

 namespace Core {
 namespace Internal {
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -44,20 +44,20 @@
 #include <utils/stringutils.h>
 #include <utils/fileutils.h>

-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QVector>
-#include <QtCore/QDebug>
-#include <QtCore/QSharedData>
-#include <QtCore/QEventLoop>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QScopedPointer>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QVector>
+#include <QDebug>
+#include <QSharedData>
+#include <QEventLoop>
+#include <QSharedPointer>
+#include <QScopedPointer>

-#include <QtGui/QMessageBox>
-#include <QtGui/QWizard>
-#include <QtGui/QMainWindow>
-#include <QtGui/QIcon>
+#include <QMessageBox>
+#include <QWizard>
+#include <QMainWindow>
+#include <QIcon>

 enum { debugWizard = 0 };

--- a/src/plugins/coreplugin/basefilewizard.h
+++ b/src/plugins/coreplugin/basefilewizard.h
@@ -40,8 +40,8 @@

 #include <extensionsystem/iplugin.h>

-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QList>
+#include <QSharedDataPointer>
+#include <QList>

 QT_BEGIN_NAMESPACE
 class QIcon;
--- a/src/plugins/coreplugin/core_global.h
+++ b/src/plugins/coreplugin/core_global.h
@@ -33,7 +33,7 @@
 #ifndef CORE_GLOBAL_H
 #define CORE_GLOBAL_H

-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 #if defined(CORE_LIBRARY)
 #  define CORE_EXPORT Q_DECL_EXPORT
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -33,7 +33,7 @@
 #ifndef CORECONSTANTS_H
 #define CORECONSTANTS_H

-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 namespace Core {
 namespace Constants {
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -42,8 +42,8 @@

 #include <extensionsystem/pluginmanager.h>

-#include <QtCore/QtPlugin>
-#include <QtCore/QDebug>
+#include <QtPlugin>
+#include <QDebug>

 using namespace Core;
 using namespace Core::Internal;
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -45,14 +45,14 @@
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QPair>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QPair>
+#include <QFileInfo>
+#include <QStringList>
+#include <QDebug>

-#include <QtGui/QAction>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QStackedWidget>
+#include <QAction>
+#include <QPlainTextEdit>
+#include <QStackedWidget>

 static Core::DesignMode *m_instance = 0;

--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -38,11 +38,11 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/variablechooser.h>

-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
-#include <QtCore/QMimeData>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMenu>
+#include <QTextStream>
+#include <QFile>
+#include <QMimeData>
+#include <QMessageBox>
+#include <QMenu>

 using namespace Core;
 using namespace Core::Internal;
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
@@ -35,8 +35,8 @@

 #include "coreplugin/externaltool.h"

-#include <QtGui/QWidget>
-#include <QtCore/QAbstractItemModel>
+#include <QWidget>
+#include <QAbstractItemModel>

 namespace Core {
 namespace Internal {
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -35,7 +35,7 @@

 #include <coreplugin/core_global.h>

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QIcon;
--- a/src/plugins/coreplugin/dialogs/iwizard.cpp
+++ b/src/plugins/coreplugin/dialogs/iwizard.cpp
@@ -35,7 +35,7 @@

 #include <extensionsystem/pluginmanager.h>

-#include <QtCore/QStringList>
+#include <QStringList>

 /*!
    \class Core::IWizard
--- a/src/plugins/coreplugin/dialogs/iwizard.h
+++ b/src/plugins/coreplugin/dialogs/iwizard.h
@@ -36,7 +36,7 @@
 #include <coreplugin/core_global.h>
 #include <coreplugin/featureprovider.h>

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QIcon;
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -39,15 +39,15 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/featureprovider.h>

-#include <QtGui/QAbstractProxyModel>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QStandardItem>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QPainter>
-#include <QtCore/QDebug>
+#include <QAbstractProxyModel>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QStandardItem>
+#include <QItemDelegate>
+#include <QPainter>
+#include <QDebug>

 Q_DECLARE_METATYPE(Core::IWizard*)

--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -35,10 +35,10 @@

 #include "iwizard.h"

-#include <QtGui/QDialog>
-#include <QtGui/QIcon>
-#include <QtCore/QList>
-#include <QtCore/QModelIndex>
+#include <QDialog>
+#include <QIcon>
+#include <QList>
+#include <QModelIndex>

 QT_BEGIN_NAMESPACE
 class QAbstractProxyModel;
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -32,9 +32,9 @@

 #include "openwithdialog.h"

-#include <QtGui/QListWidget>
-#include <QtGui/QPushButton>
-#include <QtCore/QFileInfo>
+#include <QListWidget>
+#include <QPushButton>
+#include <QFileInfo>

 using namespace Core;
 using namespace Core::Internal;
--- a/src/plugins/coreplugin/dialogs/openwithdialog.h
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.h
@@ -33,7 +33,7 @@
 #ifndef OPENWITHDIALOG_H
 #define OPENWITHDIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>
 #include "ui_openwithdialog.h"

 namespace Core {
--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp
@@ -34,14 +34,14 @@

 #include <utils/stringutils.h>

-#include <QtGui/QTreeView>
-#include <QtGui/QLabel>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QStandardItem>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QVBoxLayout>
+#include <QTreeView>
+#include <QLabel>
+#include <QStandardItemModel>
+#include <QStandardItem>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>

-#include <QtCore/QDir>
+#include <QDir>

 enum { FileNameRole = Qt::UserRole + 1 };

--- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h
+++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h
@@ -33,7 +33,7 @@
 #ifndef PROMPTOVERWRITEDIALOG_H
 #define PROMPTOVERWRITEDIALOG_H

-#include <QtGui/QDialog>
+#include <QDialog>

 QT_BEGIN_NAMESPACE
 class QTreeView;
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -36,12 +36,12 @@

 #include <coreplugin/ifile.h>

-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QPushButton>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QHeaderView>
-#include <QtGui/QCheckBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QPushButton>
+#include <QTreeWidget>
+#include <QHeaderView>
+#include <QCheckBox>

 Q_DECLARE_METATYPE(Core::IFile*)

--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
@@ -33,8 +33,8 @@
 #ifndef SAVEITEMSDIALOG_H
 #define SAVEITEMSDIALOG_H

-#include <QtCore/QList>
-#include <QtGui/QDialog>
+#include <QList>
+#include <QDialog>

 #include "ui_saveitemsdialog.h"

--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -37,27 +37,27 @@

 #include <utils/filterlineedit.h>

-#include <QtCore/QSettings>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QIcon>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolBar>
-#include <QtGui/QScrollBar>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QStyle>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QFrame>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QListView>
-#include <QtGui/QApplication>
-#include <QtGui/QGroupBox>
-#include <QtGui/QStyledItemDelegate>
+#include <QSettings>
+#include <QSortFilterProxyModel>
+#include <QItemSelectionModel>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QPushButton>
+#include <QToolButton>
+#include <QToolBar>
+#include <QScrollBar>
+#include <QSpacerItem>
+#include <QStyle>
+#include <QStackedLayout>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QFrame>
+#include <QDialogButtonBox>
+#include <QListView>
+#include <QApplication>
+#include <QGroupBox>
+#include <QStyledItemDelegate>

 static const char categoryKeyC[] = "General/LastPreferenceCategory";
 static const char pageKeyC[] = "General/LastPreferencePage";
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -35,11 +35,11 @@

 #include "coreplugin/dialogs/ioptionspage.h"

-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QPointer>
-#include <QtCore/QEventLoop>
-#include <QtGui/QDialog>
+#include <QList>
+#include <QSet>
+#include <QPointer>
+#include <QEventLoop>
+#include <QDialog>

 QT_BEGIN_NAMESPACE
 class QModelIndex;
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -42,15 +42,15 @@

 #include <utils/treewidgetcolumnstretcher.h>

-#include <QtGui/QKeyEvent>
-#include <QtGui/QShortcut>
-#include <QtGui/QHeaderView>
-#include <QtGui/QFileDialog>
-#include <QtGui/QLineEdit>
-#include <QtGui/QAction>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QTreeWidgetItem>
-#include <QtCore/QCoreApplication>
+#include <QKeyEvent>
+#include <QShortcut>
+#include <QHeaderView>
+#include <QFileDialog>
+#include <QLineEdit>
+#include <QAction>
+#include <QKeyEvent>
+#include <QTreeWidgetItem>
+#include <QCoreApplication>
 #include <QtDebug>

 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -35,7 +35,7 @@

 #include <coreplugin/actionmanager/commandmappings.h>

-#include <QtGui/QKeySequence>
+#include <QKeySequence>

 QT_BEGIN_NAMESPACE
 class QKeyEvent;
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -42,11 +42,11 @@
 #include "ieditor.h"
 #include "ifile.h"

-#include <QtCore/QLatin1String>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QWidget>
-#include <QtGui/QSplitter>
-#include <QtGui/QIcon>
+#include <QLatin1String>
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QSplitter>
+#include <QIcon>

 using namespace Core;
 using namespace Core::Internal;
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -65,27 +65,27 @@
 #include <utils/consoleprocess.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMap>
-#include <QtCore/QProcess>
-#include <QtCore/QSet>
-#include <QtCore/QSettings>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTimer>
+#include <QDateTime>
+#include <QDebug>
+#include <QFileInfo>
+#include <QMap>
+#include <QProcess>
+#include <QSet>
+#include <QSettings>
+#include <QTextCodec>
+#include <QTimer>

-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QApplication>
-#include <QtGui/QFileDialog>
-#include <QtGui/QLayout>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QSplitter>
-#include <QtGui/QStackedLayout>
+#include <QAction>
+#include <QShortcut>
+#include <QApplication>
+#include <QFileDialog>
+#include <QLayout>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSplitter>
+#include <QStackedLayout>

 enum { debugEditorManager=0 };

--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -38,9 +38,9 @@
 #include <coreplugin/id.h>
 #include <coreplugin/ifile.h> // enumerations

-#include <QtCore/QList>
-#include <QtGui/QWidget>
-#include <QtGui/QMenu>
+#include <QList>
+#include <QWidget>
+#include <QMenu>

 QT_BEGIN_NAMESPACE
 class QModelIndex;
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -45,26 +45,26 @@
 #include <coreplugin/findplaceholder.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMimeData>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QMimeData>

-#include <QtGui/QApplication>
-#include <QtGui/QComboBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
-#include <QtGui/QToolButton>
-#include <QtGui/QMenu>
-#include <QtGui/QClipboard>
-#include <QtGui/QAction>
-#include <QtGui/QSplitter>
-#include <QtGui/QStackedLayout>
+#include <QApplication>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QStackedWidget>
+#include <QStyle>
+#include <QStyleOption>
+#include <QToolButton>
+#include <QMenu>
+#include <QClipboard>
+#include <QAction>
+#include <QSplitter>
+#include <QStackedLayout>

 #ifdef Q_OS_MAC
 #include <qmacstyle_mac.h>
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -35,14 +35,14 @@

 #include "coreplugin/id.h"

-#include <QtCore/QMap>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QPointer>
-#include <QtCore/QVariant>
+#include <QMap>
+#include <QList>
+#include <QString>
+#include <QPointer>
+#include <QVariant>

-#include <QtGui/QIcon>
-#include <QtGui/QWidget>
+#include <QIcon>
+#include <QWidget>

 QT_BEGIN_NAMESPACE
 class QAction;
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -37,7 +37,7 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/id.h>

-#include <QtCore/QMetaType>
+#include <QMetaType>

 namespace Core {

--- a/src/plugins/coreplugin/editormanager/iexternaleditor.h
+++ b/src/plugins/coreplugin/editormanager/iexternaleditor.h
@@ -35,7 +35,7 @@

 #include <coreplugin/core_global.h>

-#include <QtCore/QObject>
+#include <QObject>

 namespace Core {

--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
@@ -34,8 +34,8 @@
 #include "ieditor.h"
 #include "ifile.h"

-#include <QtCore/QDir>
-#include <QtGui/QIcon>
+#include <QDir>
+#include <QIcon>

 namespace Core {

--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.h
@@ -36,7 +36,7 @@
 #include "../core_global.h"
 #include "../id.h"

-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>

 QT_FORWARD_DECLARE_CLASS(QIcon)

--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -43,13 +43,13 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QTimer>
-#include <QtGui/QMenu>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
-#include <QtGui/QHeaderView>
-#include <QtGui/QKeyEvent>
+#include <QTimer>
+#include <QMenu>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOption>
+#include <QHeaderView>
+#include <QKeyEvent>
 #ifdef Q_OS_MAC
 #include <qmacstyle_mac.h>
 #endif
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -37,7 +37,7 @@

 #include <coreplugin/inavigationwidgetfactory.h>

-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>

 namespace Core {
 class IEditor;
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -38,10 +38,10 @@

 #include <utils/qtcassert.h>

-#include <QtGui/QFocusEvent>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QVBoxLayout>
+#include <QFocusEvent>
+#include <QHeaderView>
+#include <QTreeWidget>
+#include <QVBoxLayout>

 Q_DECLARE_METATYPE(Core::Internal::EditorView*)
 Q_DECLARE_METATYPE(Core::IFile *)
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.h
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h
@@ -33,8 +33,8 @@
 #ifndef OPENEDITORSWINDOW_H
 #define OPENEDITORSWINDOW_H

-#include <QtGui/QFrame>
-#include <QtGui/QIcon>
+#include <QFrame>
+#include <QIcon>

 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -33,9 +33,9 @@
 #include "systemeditor.h"
 #include "id.h"

-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtGui/QDesktopServices>
+#include <QStringList>
+#include <QUrl>
+#include <QDesktopServices>

 using namespace Core;
 using namespace Core::Internal;
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -50,21 +50,21 @@
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>

-#include <QtCore/QSettings>
-#include <QtCore/QEvent>
-#include <QtCore/QDir>
-#include <QtCore/QPointer>
-#include <QtGui/QApplication>
-#include <QtGui/QComboBox>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QScrollArea>
-#include <QtGui/QTabWidget>
-#include <QtGui/QToolButton>
-#include <QtGui/QMenu>
-#include <QtGui/QClipboard>
-#include <QtGui/QLabel>
-#include <QtGui/QToolBar>
+#include <QSettings>
+#include <QEvent>
+#include <QDir>
+#include <QPointer>
+#include <QApplication>
+#include <QComboBox>
+#include <QPlainTextEdit>
+#include <QVBoxLayout>
+#include <QScrollArea>
+#include <QTabWidget>
+#include <QToolButton>
+#include <QMenu>
+#include <QClipboard>
+#include <QLabel>
+#include <QToolBar>

 enum {
    debug = false
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -37,7 +37,7 @@

 #include <utils/styledbar.h>

-#include <QtGui/QIcon>
+#include <QIcon>

 namespace Core {
 class IEditor;
--- a/src/plugins/coreplugin/eventfilteringmainwindow.cpp
+++ b/src/plugins/coreplugin/eventfilteringmainwindow.cpp
@@ -36,9 +36,9 @@
 #include <windows.h>
 #endif

-#include <QtCore/QtDebug>
-#include <QtCore/QEvent>
-#include <QtCore/QCoreApplication>
+#include <QtDebug>
+#include <QEvent>
+#include <QCoreApplication>

 namespace Core {
 namespace Internal {
--- a/src/plugins/coreplugin/eventfilteringmainwindow.h
+++ b/src/plugins/coreplugin/eventfilteringmainwindow.h
@@ -33,7 +33,7 @@
 #ifndef EVENTFILTERINGMAINWINDOW_H
 #define EVENTFILTERINGMAINWINDOW_H

-#include <QtGui/QMainWindow>
+#include <QMainWindow>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -49,14 +49,14 @@
 #include <utils/fileutils.h>
 #include <utils/qtcprocess.h>

-#include <QtCore/QCoreApplication>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QDateTime>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
+#include <QCoreApplication>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QDir>
+#include <QFile>
+#include <QDateTime>
+#include <QMenu>
+#include <QAction>

 #include <QtDebug>

--- a/src/plugins/coreplugin/externaltool.h
+++ b/src/plugins/coreplugin/externaltool.h
@@ -33,12 +33,12 @@
 #ifndef EXTERNALTOOL_H
 #define EXTERNALTOOL_H

-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QProcess>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTextCodec>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QStringList>
+#include <QProcess>
+#include <QSharedPointer>
+#include <QTextCodec>
+#include <QMetaType>

 namespace Utils {
 class QtcProcess;
--- a/src/plugins/coreplugin/externaltoolmanager.h
+++ b/src/plugins/coreplugin/externaltoolmanager.h
@@ -35,10 +35,10 @@

 #include "core_global.h"

-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QObject>
+#include <QMap>
+#include <QList>
+#include <QString>

 QT_FORWARD_DECLARE_CLASS(QAction)

--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -39,20 +39,20 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/imode.h>

-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPicture>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QAction>
-#include <QtGui/QStatusBar>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QApplication>
-#include <QtCore/QEvent>
-#include <QtCore/QAnimationGroup>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QDebug>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QPicture>
+#include <QVBoxLayout>
+#include <QAction>
+#include <QStatusBar>
+#include <QStyle>
+#include <QStyleOption>
+#include <QMouseEvent>
+#include <QApplication>
+#include <QEvent>
+#include <QAnimationGroup>
+#include <QPropertyAnimation>
+#include <QDebug>

 using namespace Core;
 using namespace Internal;
--- a/src/plugins/coreplugin/fancyactionbar.h
+++ b/src/plugins/coreplugin/fancyactionbar.h
@@ -33,7 +33,7 @@
 #ifndef FANCYACTIONBAR_H
 #define FANCYACTIONBAR_H

-#include <QtGui/QToolButton>
+#include <QToolButton>

 QT_BEGIN_NAMESPACE
 class QVBoxLayout;
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -34,21 +34,21 @@
 #include <utils/stylehelper.h>
 #include <utils/styledbar.h>

-#include <QtCore/QDebug>
+#include <QDebug>

-#include <QtGui/QColorDialog>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWindowsStyle>
-#include <QtGui/QPainter>
-#include <QtGui/QSplitter>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QStatusBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolTip>
-#include <QtCore/QAnimationGroup>
-#include <QtCore/QPropertyAnimation>
+#include <QColorDialog>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QMouseEvent>
+#include <QWindowsStyle>
+#include <QPainter>
+#include <QSplitter>
+#include <QStackedLayout>
+#include <QStatusBar>
+#include <QToolButton>
+#include <QToolTip>
+#include <QAnimationGroup>
+#include <QPropertyAnimation>

 using namespace Core;
 using namespace Internal;
--- a/src/plugins/coreplugin/fancytabwidget.h
+++ b/src/plugins/coreplugin/fancytabwidget.h
@@ -33,11 +33,11 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H

-#include <QtGui/QIcon>
-#include <QtGui/QWidget>
+#include <QIcon>
+#include <QWidget>

-#include <QtCore/QTimer>
-#include <QtCore/QPropertyAnimation>
+#include <QTimer>
+#include <QPropertyAnimation>

 QT_BEGIN_NAMESPACE
 class QPainter;
--- a/src/plugins/coreplugin/featureprovider.h
+++ b/src/plugins/coreplugin/featureprovider.h
@@ -37,9 +37,9 @@

 #include <coreplugin/id.h>

-#include <QtCore/QObject>
-#include <QtCore/QSet>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QSet>
+#include <QStringList>


 namespace Utils {
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -35,16 +35,16 @@

 #include <utils/qtcassert.h>

-#include <QtGui/QApplication>
-#include <QtGui/QStyle>
-#include <QtGui/QPainter>
-#include <QtCore/QFileInfo>
-#include <QtCore/QPair>
-#include <QtCore/QDebug>
+#include <QApplication>
+#include <QStyle>
+#include <QPainter>
+#include <QFileInfo>
+#include <QPair>
+#include <QDebug>

-#include <QtGui/QFileIconProvider>
-#include <QtGui/QIcon>
-#include <QtGui/QStyle>
+#include <QFileIconProvider>
+#include <QIcon>
+#include <QStyle>

 /*!
  \class Core::FileIconProvider
--- a/src/plugins/coreplugin/fileiconprovider.h
+++ b/src/plugins/coreplugin/fileiconprovider.h
@@ -35,8 +35,8 @@

 #include <coreplugin/core_global.h>

-#include <QtGui/QStyle>
-#include <QtGui/QFileIconProvider>
+#include <QStyle>
+#include <QFileIconProvider>

 QT_BEGIN_NAMESPACE
 class QFileInfo;
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -48,20 +48,20 @@
 #include <utils/pathchooser.h>
 #include <utils/reloadpromptutils.h>

-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFileSystemWatcher>
-#include <QtCore/QPair>
-#include <QtCore/QSettings>
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileSystemWatcher>
+#include <QPair>
+#include <QSettings>
+#include <QTimer>
+#include <QAction>
+#include <QFileDialog>
+#include <QMainWindow>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPushButton>

 /*!
  \class Core::FileManager
--- a/src/plugins/coreplugin/filemanager.h
+++ b/src/plugins/coreplugin/filemanager.h
@@ -35,10 +35,10 @@

 #include <coreplugin/id.h>

-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QPair>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QStringList>
+#include <QPair>
+#include <QVariant>

 QT_BEGIN_NAMESPACE
 class QAction;
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -34,12 +34,12 @@

 #include <utils/environment.h>

-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QProcess>
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QWidget>
+#include <QDir>
+#include <QFileInfo>
+#include <QProcess>
+#include <QApplication>
+#include <QMessageBox>
+#include <QWidget>

 #ifndef Q_OS_WIN
 #include <coreplugin/icore.h>
@@ -48,7 +48,7 @@
 #ifndef Q_OS_MAC
 #include <coreplugin/coreconstants.h>
 #include <utils/unixutils.h>
-#include <QtGui/QPushButton>
+#include <QPushButton>
 #endif
 #endif

--- a/src/plugins/coreplugin/findplaceholder.cpp
+++ b/src/plugins/coreplugin/findplaceholder.cpp
@@ -34,7 +34,7 @@

 #include <extensionsystem/pluginmanager.h>

-#include <QtGui/QVBoxLayout>
+#include <QVBoxLayout>


 using namespace Core;
--- a/src/plugins/coreplugin/findplaceholder.h
+++ b/src/plugins/coreplugin/findplaceholder.h
@@ -35,8 +35,8 @@

 #include "core_global.h"

-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QPointer>
+#include <QWidget>

 namespace Core {

--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -40,14 +40,14 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>

-#include <QtGui/QMainWindow>
-#include <QtGui/QMessageBox>
+#include <QMainWindow>
+#include <QMessageBox>

-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextStream>
-#include <QtCore/QDir>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QSettings>
+#include <QCoreApplication>
+#include <QTextStream>
+#include <QDir>
+#include <QLibraryInfo>
+#include <QSettings>

 #include "ui_generalsettings.h"

--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -34,7 +34,7 @@
 #define GENERALSETTINGS_H

 #include <coreplugin/dialogs/ioptionspage.h>
-#include <QtCore/QPointer>
+#include <QPointer>

 QT_BEGIN_NAMESPACE
 class QMessageBox;
--- a/src/plugins/coreplugin/generatedfile.cpp
+++ b/src/plugins/coreplugin/generatedfile.cpp
@@ -35,9 +35,9 @@

 #include <utils/fileutils.h>

-#include <QtCore/QString>
-#include <QtCore/QDir>
-#include <QtCore/QCoreApplication>
+#include <QString>
+#include <QDir>
+#include <QCoreApplication>

 namespace Core {

--- a/src/plugins/coreplugin/generatedfile.h
+++ b/src/plugins/coreplugin/generatedfile.h
@@ -36,8 +36,8 @@

 #include "coreplugin/id.h"

-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QList>
+#include <QSharedDataPointer>
+#include <QList>

 namespace Core {
 class GeneratedFilePrivate;
--- a/src/plugins/coreplugin/helpmanager.cpp
+++ b/src/plugins/coreplugin/helpmanager.cpp
@@ -35,18 +35,18 @@
 #include <coreplugin/icore.h>
 #include <utils/filesystemwatcher.h>

-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QStringList>

-#include <QtHelp/QHelpEngineCore>
+#include <QHelpEngineCore>

-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlQuery>
+#include <QSqlDatabase>
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlQuery>

 namespace Core {

--- a/src/plugins/coreplugin/helpmanager.h
+++ b/src/plugins/coreplugin/helpmanager.h
@@ -35,11 +35,11 @@

 #include "core_global.h"

-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtCore/QMap>
-#include <QtCore/QHash>
+#include <QObject>
+#include <QStringList>
+#include <QVariant>
+#include <QMap>
+#include <QHash>

 QT_FORWARD_DECLARE_CLASS(QUrl)

--- a/src/plugins/coreplugin/icontext.h
+++ b/src/plugins/coreplugin/icontext.h
@@ -35,10 +35,10 @@

 #include <coreplugin/core_global.h>

-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QList>
+#include <QObject>
+#include <QPointer>
+#include <QWidget>

 namespace Core {

--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -347,11 +347,11 @@
 #include "icore.h"
 #include "mainwindow.h"

-#include <QtCore/QDir>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QDir>
+#include <QCoreApplication>
+#include <QDebug>

-#include <QtGui/QStatusBar>
+#include <QStatusBar>

 namespace Core {

--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -35,8 +35,8 @@

 #include "core_global.h"

-#include <QtCore/QObject>
-#include <QtCore/QSettings>
+#include <QObject>
+#include <QSettings>

 QT_BEGIN_NAMESPACE
 class QMainWindow;
--- a/src/plugins/coreplugin/icorelistener.h
+++ b/src/plugins/coreplugin/icorelistener.h
@@ -34,7 +34,7 @@
 #define ICORELISTENER_H

 #include "core_global.h"
-#include <QtCore/QObject>
+#include <QObject>

 namespace Core {
 class IEditor;
--- a/src/plugins/coreplugin/id.cpp
+++ b/src/plugins/coreplugin/id.cpp
@@ -36,7 +36,7 @@

 #include <utils/qtcassert.h>

-#include <QtCore/QHash>
+#include <QHash>

 namespace Core {

--- a/src/plugins/coreplugin/id.h
+++ b/src/plugins/coreplugin/id.h
@@ -35,8 +35,8 @@

 #include "core_global.h"

-#include <QtCore/QMetaType>
-#include <QtCore/QString>
+#include <QMetaType>
+#include <QString>

 namespace Core {

--- a/src/plugins/coreplugin/ifile.cpp
+++ b/src/plugins/coreplugin/ifile.cpp
@@ -34,8 +34,8 @@

 #include "infobar.h"

-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QFile>
+#include <QFileInfo>

 namespace Core {

--- a/src/plugins/coreplugin/ifile.h
+++ b/src/plugins/coreplugin/ifile.h
@@ -34,7 +34,7 @@
 #define IFILE_H

 #include "core_global.h"
-#include <QtCore/QObject>
+#include <QObject>

 namespace Core {

--- a/src/plugins/coreplugin/ifilefactory.h
+++ b/src/plugins/coreplugin/ifilefactory.h
@@ -35,7 +35,7 @@

 #include "core_global.h"

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QStringList;
--- a/src/plugins/coreplugin/ifilewizardextension.h
+++ b/src/plugins/coreplugin/ifilewizardextension.h
@@ -35,8 +35,8 @@

 #include <coreplugin/core_global.h>

-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>

 QT_BEGIN_NAMESPACE
 class QWizardPage;
--- a/src/plugins/coreplugin/imode.h
+++ b/src/plugins/coreplugin/imode.h
@@ -35,7 +35,7 @@

 #include "icontext.h"

-#include <QtGui/QIcon>
+#include <QIcon>

 namespace Core {

--- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
@@ -32,7 +32,7 @@

 #include "inavigationwidgetfactory.h"

-#include <QtGui/QKeySequence>
+#include <QKeySequence>

 using namespace Core;

--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -35,8 +35,8 @@

 #include <coreplugin/id.h>

-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>

 QT_BEGIN_NAMESPACE
 class QToolButton;
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -34,12 +34,12 @@

 #include <coreplugin/coreconstants.h>

-#include <QtGui/QFrame>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QToolButton>

-#include <QtCore/QVariant>
+#include <QVariant>

 namespace Core {

--- a/src/plugins/coreplugin/infobar.h
+++ b/src/plugins/coreplugin/infobar.h
@@ -35,7 +35,7 @@

 #include "core_global.h"

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QBoxLayout;
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -35,9 +35,9 @@

 #include "core_global.h"

-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QObject>
+#include <QList>
+#include <QString>

 QT_BEGIN_NAMESPACE
 class QWidget;
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -36,9 +36,9 @@
 #include "core_global.h"
 #include "id.h"

-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QFlags>
+#include <QObject>
+#include <QString>
+#include <QFlags>

 namespace Core {

--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -85,28 +85,28 @@
 #include <utils/stringutils.h>
 #include <extensionsystem/pluginmanager.h>

-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QTimer>
-#include <QtCore/QtPlugin>
-#include <QtCore/QUrl>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QMimeData>
+#include <QDebug>
+#include <QFileInfo>
+#include <QSettings>
+#include <QTimer>
+#include <QtPlugin>
+#include <QUrl>
+#include <QDir>
+#include <QFile>
+#include <QMimeData>

-#include <QtGui/QApplication>
-#include <QtGui/QCloseEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QPixmap>
-#include <QtGui/QPrinter>
-#include <QtGui/QShortcut>
-#include <QtGui/QStatusBar>
-#include <QtGui/QWizard>
-#include <QtGui/QToolButton>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMenuBar>
-#include <QtGui/QPushButton>
+#include <QApplication>
+#include <QCloseEvent>
+#include <QMenu>
+#include <QPixmap>
+#include <QPrinter>
+#include <QShortcut>
+#include <QStatusBar>
+#include <QWizard>
+#include <QToolButton>
+#include <QMessageBox>
+#include <QMenuBar>
+#include <QPushButton>

 /*
 #ifdef Q_OS_UNIX
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -37,8 +37,8 @@
 #include "icontext.h"
 #include "icore.h"

-#include <QtCore/QMap>
-#include <QtGui/QColor>
+#include <QMap>
+#include <QColor>

 QT_BEGIN_NAMESPACE
 class QSettings;
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -34,7 +34,7 @@

 #include "styleanimator.h"

-#include <QtCore/QLibrary>
+#include <QLibrary>

 #include <coreplugin/coreconstants.h>

@@ -43,27 +43,27 @@

 #include <utils/fancymainwindow.h>

-#include <QtGui/QApplication>
-#include <QtGui/QComboBox>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QDockWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenuBar>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QPixmapCache>
-#include <QtGui/QPushButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSplitter>
-#include <QtGui/QStatusBar>
-#include <QtGui/QStyleFactory>
-#include <QtGui/QStyleOption>
-#include <QtGui/QToolBar>
-#include <QtGui/QTreeView>
-#include <QtGui/QToolButton>
-#include <QtGui/QAbstractItemView>
+#include <QApplication>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QDockWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QPainter>
+#include <QPixmap>
+#include <QPixmapCache>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QSplitter>
+#include <QStatusBar>
+#include <QStyleFactory>
+#include <QStyleOption>
+#include <QToolBar>
+#include <QTreeView>
+#include <QToolButton>
+#include <QAbstractItemView>

 // We define a currently unused state for indicating animations
 #define State_Animating 0x00000040
--- a/src/plugins/coreplugin/manhattanstyle.h
+++ b/src/plugins/coreplugin/manhattanstyle.h
@@ -35,7 +35,7 @@

 #include "core_global.h"

-#include <QtGui/QProxyStyle>
+#include <QProxyStyle>

 class ManhattanStylePrivate;

--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -35,8 +35,8 @@

 #include <extensionsystem/pluginmanager.h>

-#include <QtGui/QStatusBar>
-#include <QtGui/QApplication>
+#include <QStatusBar>
+#include <QApplication>

 using namespace Core;

--- a/src/plugins/coreplugin/messagemanager.h
+++ b/src/plugins/coreplugin/messagemanager.h
@@ -34,7 +34,7 @@
 #define MESSAGEMANAGER_H

 #include "core_global.h"
-#include <QtCore/QObject>
+#include <QObject>

 namespace Core {

--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -35,7 +35,7 @@
 #include "icontext.h"
 #include "coreconstants.h"

-#include <QtGui/QScrollBar>
+#include <QScrollBar>

 using namespace Core::Internal;

--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -36,24 +36,24 @@

 #include <utils/qtcassert.h>

-#include <QtCore/QByteArray>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLocale>
-#include <QtCore/QMap>
-#include <QtCore/QHash>
-#include <QtCore/QMultiHash>
-#include <QtCore/QRegExp>
-#include <QtCore/QSharedData>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QDir>
+#include <QFileInfo>
+#include <QLocale>
+#include <QMap>
+#include <QHash>
+#include <QMultiHash>
+#include <QRegExp>
+#include <QSharedData>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTextStream>
+#include <QMutexLocker>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>

 #include <algorithm>
 #include <functional>
--- a/src/plugins/coreplugin/mimedatabase.h
+++ b/src/plugins/coreplugin/mimedatabase.h
@@ -34,13 +34,13 @@
 #define MIMEDATABASE_H

 #include <coreplugin/core_global.h>
-#include <QtCore/QStringList>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QByteArray>
-#include <QtCore/QMutex>
-#include <QtCore/QFileInfo>
-#include <QtCore/QPair>
+#include <QStringList>
+#include <QSharedDataPointer>
+#include <QSharedPointer>
+#include <QByteArray>
+#include <QMutex>
+#include <QFileInfo>
+#include <QPair>

 QT_BEGIN_NAMESPACE
 class QIODevice;
--- a/Show More
+++ b/Show More