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>

94 files changed, 269 insertions, 269 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp
index 9f784e5cd0..bb91a2f34b 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditornodeinstanceview.cpp
@@ -34,7 +34,7 @@
 #include "formeditorview.h"
 
 #include <modelnode.h>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 15f4d5395a..d70b8108ae 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -65,27 +65,27 @@
 #include <utils/fileutils.h>
 #include <utils/crumblepath.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrl>
-#include <QtCore/QProcess>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QtDebug>
-#include <QtCore/QEvent>
-
-#include <QtGui/QBoxLayout>
-#include <QtGui/QComboBox>
-#include <QtGui/QErrorMessage>
-#include <QtGui/QFileDialog>
-#include <QtGui/QLabel>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QMessageBox>
-#include <QtGui/QUndoStack>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QApplication>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QUrl>
+#include <QProcess>
+#include <QTemporaryFile>
+#include <QtDebug>
+#include <QEvent>
+
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QErrorMessage>
+#include <QFileDialog>
+#include <QLabel>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMessageBox>
+#include <QUndoStack>
+#include <QPlainTextEdit>
+#include <QApplication>
 
 #include <projectexplorer/projectexplorer.h>
 #include <qt4projectmanager/qt4project.h>
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
index 667418d738..1539cf42b6 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
@@ -35,8 +35,8 @@
 
 #include "rewriterview.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QUndoStack;
diff --git a/src/plugins/qmldesigner/components/integration/integrationcore.cpp b/src/plugins/qmldesigner/components/integration/integrationcore.cpp
index cbbcb0b69b..497151b598 100644
--- a/src/plugins/qmldesigner/components/integration/integrationcore.cpp
+++ b/src/plugins/qmldesigner/components/integration/integrationcore.cpp
@@ -36,8 +36,8 @@
 #include "navigatorwidget.h"
 #include "metainfo.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
+#include <QCoreApplication>
+#include <QObject>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/integrationcore.h b/src/plugins/qmldesigner/components/integration/integrationcore.h
index 5d6a99cc6a..104b8a7bf4 100644
--- a/src/plugins/qmldesigner/components/integration/integrationcore.h
+++ b/src/plugins/qmldesigner/components/integration/integrationcore.h
@@ -33,7 +33,7 @@
 #ifndef QMLDESIGNERCORE_H
 #define QMLDESIGNERCORE_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
index 6f9b4cbf2c..ccd1891cbc 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.cpp
@@ -30,7 +30,7 @@
 **
 **************************************************************************/
 
-#include <QtGui/QStackedWidget>
+#include <QStackedWidget>
 
 #include "designdocumentcontroller.h"
 #include "stackedutilitypanelcontroller.h"
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
index 46686d8469..62f003f0b8 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.cpp
@@ -32,9 +32,9 @@
 
 #include <QtDebug>
 #include <QEvent>
-#include <QtGui/QDockWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QDockWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include "utilitypanelcontroller.h"
 
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
index 9dc03c41a6..5e55bfa5dd 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
@@ -33,9 +33,9 @@
 #ifndef UtilityPanelController_h
 #define UtilityPanelController_h
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtGui/QWidget>
+#include <QObject>
+#include <QString>
+#include <QWidget>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
index 7a45eea32c..500533dc53 100644
--- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
+++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp
@@ -30,10 +30,10 @@
 **
 **************************************************************************/
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QObject>
-#include <QtCore/QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QObject>
+#include <QCoreApplication>
 
 #include "xuifiledialog.h"
 
diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.h b/src/plugins/qmldesigner/components/integration/xuifiledialog.h
index 1f14c1c754..ab60c052a0 100644
--- a/src/plugins/qmldesigner/components/integration/xuifiledialog.h
+++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.h
@@ -33,10 +33,10 @@
 #ifndef XUIFILEDIALOG_H
 #define XUIFILEDIALOG_H
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 
-#include <QtGui/QFileDialog>
+#include <QFileDialog>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
index 5c252012c8..047c38334c 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp
@@ -32,8 +32,8 @@
 
 #include "customdraganddrop.h"
 
-#include <QtCore/QMimeData>
-#include <QtCore/QPoint>
+#include <QMimeData>
+#include <QPoint>
 #include <QLabel>
 
 #include <QMouseEvent>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
index fe724e4b56..263743e066 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
@@ -33,12 +33,12 @@
 #include "itemlibrarycomponents.h"
 #include "customdraganddrop.h"
 
-#include <QtCore/QMimeData>
-#include <QtCore/QDebug>
+#include <QMimeData>
+#include <QDebug>
 
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtGui/QDrag>
+#include <QImage>
+#include <QPixmap>
+#include <QDrag>
 #include <QPainter>
 #include <QLabel>
 #include <itemlibraryinfo.h>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
index 041161f490..e4cec2d68e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h
@@ -33,8 +33,8 @@
 #ifndef ITEMLIBRARYTREEVIEW_H
 #define ITEMLIBRARYTREEVIEW_H
 
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+#include <QTreeView>
+#include <QStandardItemModel>
 #include <QDrag>
 #include <QDebug>
 #include <QTimeLine>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index 876dbe532b..f97c761a2b 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -34,8 +34,8 @@
 #define ITEMLIBRARYWIDGET_H
 
 #include "itemlibraryinfo.h"
-#include <QtGui/QFrame>
-#include <QtGui/QToolButton>
+#include <QFrame>
+#include <QToolButton>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 65d43640c8..17268978de 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -30,9 +30,9 @@
 **
 **************************************************************************/
 
-#include <QtGui/QBoxLayout>
-#include <QtGui/QTreeView>
-#include <QtGui/QHeaderView>
+#include <QBoxLayout>
+#include <QTreeView>
+#include <QHeaderView>
 #include <model.h>
 
 #include "navigatorwidget.h"
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
index 9e328207ab..47ece120c9 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
@@ -35,7 +35,7 @@
 
 #include <QFrame>
 #include <QAbstractItemModel>
-#include <QtGui/QToolButton>
+#include <QToolButton>
 
 #include "navigatortreeview.h"
 
diff --git a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h
index 35e42937c6..c268be8ae1 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h
+++ b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h
@@ -33,7 +33,7 @@
 #ifndef IPLUGIN_H
 #define IPLUGIN_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define QMLDESIGNER_PLUGIN_INTERFACE "com.Nokia.QmlDesigner.IPlugin.v10"
 
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
index fb667547dc..f3dc7f0c88 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
@@ -35,24 +35,24 @@
 #include "pluginpath.h"
 #include <metainfo.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
-#include <QtCore/QDir>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QObject>
+#include <QSharedData>
+#include <QDir>
+#include <QStringList>
+#include <QDebug>
 #include <QWeakPointer>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibraryInfo>
-
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QStandardItem>
-#include <QtGui/QTreeView>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QDialog>
-#include <QtGui/QLabel>
-#include <QtGui/QDialogButtonBox>
+#include <QPluginLoader>
+#include <QFileInfo>
+#include <QLibraryInfo>
+
+#include <QStandardItemModel>
+#include <QStandardItem>
+#include <QTreeView>
+#include <QVBoxLayout>
+#include <QDialog>
+#include <QLabel>
+#include <QDialogButtonBox>
 
 enum { debug = 0 };
 
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h
index 8cbf4bb1e0..e5bc79eebc 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h
@@ -34,8 +34,8 @@
 #define PLUGINMANAGER_H
 
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
index ba652cf57b..13bd5cf407 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp
@@ -32,14 +32,14 @@
 
 #include "pluginpath.h"
 #include <iplugin.h>
-#include <QtCore/QLibrary>
+#include <QLibrary>
 #include <QWeakPointer>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
+#include <QPluginLoader>
+#include <QFileInfo>
+#include <QLibraryInfo>
+#include <QCoreApplication>
+#include <QObject>
+#include <QSharedData>
 #include <QDebug>
 
 enum { debug = 1 };
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
index 934e41182c..7a15f4cccc 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h
@@ -35,11 +35,11 @@
 
 #include "pluginmanager.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QWeakPointer>
-#include <QtCore/QList>
-#include <QtCore/QDir>
-#include <QtGui/QStandardItem>
+#include <QList>
+#include <QDir>
+#include <QStandardItem>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 39da848c90..76192b898f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -36,7 +36,7 @@
 #include <QDeclarativeContext>
 #include <QDeclarativeEngine>
 #include <QDeclarativeComponent>
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QFile>
 #include <QPixmap>
 #include <QTimeLine>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
index 9fdc9ef3f5..ee6b5cd7a7 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.h
@@ -34,7 +34,7 @@
 #ifndef FILEWIDGET_H
 #define FILEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QLabel>
 #include <QToolButton>
 #include <QLineEdit>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
index 8fae5bb011..a62702b02f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/layoutwidget.h
@@ -34,7 +34,7 @@
 #ifndef LAYOUTWIDGET_H
 #define LAYOUTWIDGET_H
 
-#include <QtGui/QFrame>
+#include <QFrame>
 #include <QLabel>
 #include <QPushButton>
 #include <QUrl>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/originwidget.h b/src/plugins/qmldesigner/components/propertyeditor/originwidget.h
index 767e1db7b6..8d4b721298 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/originwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/originwidget.h
@@ -33,7 +33,7 @@
 #ifndef ORIGINWIDGET_H
 #define ORIGINWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index c092034159..24059afbac 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -60,17 +60,17 @@
 
 #include <utils/fileutils.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileSystemWatcher>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QShortcut>
-#include <QtGui/QStackedWidget>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileSystemWatcher>
+#include <QFileInfo>
+#include <QDebug>
+#include <QTimer>
+#include <QDeclarativeView>
+#include <QDeclarativeContext>
+#include <QVBoxLayout>
+#include <QShortcut>
+#include <QStackedWidget>
 #include <QDeclarativeEngine>
 #include <private/qdeclarativemetatype_p.h>
 #include <QMessageBox>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h
index d78fb99cbb..a9c321d4a8 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.h
@@ -33,8 +33,8 @@
 #ifndef ResetWidget_h
 #define ResetWidget_h
 
-#include <QtGui/QGroupBox>
-#include <QtGui/QPushButton>
+#include <QGroupBox>
+#include <QPushButton>
 
 QT_BEGIN_NAMESPACE
 class QListWidget;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h
index d3778a470f..a7487589a1 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.h
@@ -33,7 +33,7 @@
 #ifndef SIBLINGCOMBOBOX_H
 #define SIBLINGCOMBOBOX_H
 
-#include <QtGui/QComboBox>
+#include <QComboBox>
 
 #include <qmlitemnode.h>
 
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h
index 5102bc727c..8526671a12 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h
@@ -35,8 +35,8 @@
 
 #include"abstractview.h"
 
-#include <QtDeclarative/QDeclarativeImageProvider>
-#include <QtCore/QWeakPointer>
+#include <QDeclarativeImageProvider>
+#include <QWeakPointer>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
index 1155d215f1..b891524188 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
@@ -33,7 +33,7 @@
 #include "stateseditormodel.h"
 #include "stateseditorview.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 #include <QMessageBox>
 
 #include <nodelistproperty.h>
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
index 5288b4d67e..a15c47ba51 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
@@ -39,18 +39,18 @@
 #include <invalidargumentexception.h>
 #include <invalidqmlsourceexception.h>
 
-#include <QtCore/QFile>
+#include <QFile>
 #include <qapplication.h>
 
-#include <QtGui/QBoxLayout>
-#include <QtGui/QListWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QMessageBox>
+#include <QBoxLayout>
+#include <QListWidget>
+#include <QPushButton>
+#include <QMessageBox>
 
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeItem>
+#include <QDeclarativeView>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeItem>
 
 enum {
     debug = false
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
index 8c3bf5d2ef..d683adfbb5 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h
@@ -33,8 +33,8 @@
 #ifndef STATESEDITORWIDGET_H
 #define STATESEDITORWIDGET_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QListWidgetItem>
+#include <QWidget>
+#include <QListWidgetItem>
 
 QT_BEGIN_NAMESPACE
 class QDeclarativeView;
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp
index 655f4a17d8..d527a1ba9b 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "customstyleplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
index cc3d6d7d28..83a87fabfd 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
@@ -34,7 +34,7 @@
 #define CUSTOMSTYLEPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h
index d1982d4bd1..879b1a9b81 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h
@@ -36,7 +36,7 @@
 #include <qmljs/parser/qmljsastvisitor_p.h>
 #include <qmljs/qmljsdocument.h>
 
-#include <QtCore/QString>
+#include <QString>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
index 38a1adb56f..fdeb93fa8b 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h
@@ -33,7 +33,7 @@
 #ifndef CHANGEIMPORTSVISITOR_H
 #define CHANGEIMPORTSVISITOR_H
 
-#include <QtCore/QSet>
+#include <QSet>
 
 #include "import.h"
 #include "qmlrewriter.h"
diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp
index 911829a4f7..7499643926 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp
@@ -34,7 +34,7 @@
 
 #include <qmljs/parser/qmljsast_p.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
index 63a71269b9..f4fc54c24e 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
@@ -36,7 +36,7 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h
index b813846a47..5e0bf52886 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h
@@ -35,7 +35,7 @@
 
 #include "qmlrewriter.h"
 
-#include <QtCore/QStack>
+#include <QStack>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
index 22e567e5d9..1471d169b6 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.cpp
@@ -36,7 +36,7 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h
index 60e8da3697..2007dd4ef7 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h
@@ -38,8 +38,8 @@
 #include <qmljs/parser/qmljsastvisitor_p.h>
 #include <qmljs/qmljsutils.h>
 
-#include <QtCore/QStack>
-#include <QtCore/QString>
+#include <QStack>
+#include <QString>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index 564ac49bf4..1aa9eb2101 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -33,7 +33,7 @@
 #ifndef ABSTRACTROPERTY_H
 #define ABSTRACTROPERTY_H
 
-#include <QtCore/QVariant>
+#include <QVariant>
 #include <QWeakPointer>
 #include <QSharedPointer>
 #include "corelib_global.h"
diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
index 5031d352d6..1756e3b2d7 100644
--- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
@@ -39,7 +39,7 @@
 
 #include <texteditor/basetexteditor.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace QmlJS {
 class Snapshot;
diff --git a/src/plugins/qmldesigner/designercore/include/corelib_global.h b/src/plugins/qmldesigner/designercore/include/corelib_global.h
index 9bd03474cd..a6ecf4c3fd 100644
--- a/src/plugins/qmldesigner/designercore/include/corelib_global.h
+++ b/src/plugins/qmldesigner/designercore/include/corelib_global.h
@@ -54,6 +54,6 @@
 //#  define TEST_CORESHARED_EXPORT
 //#endif
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #endif // CORELIB_GLOBAL_H
diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h
index 511dea263c..e767227de9 100644
--- a/src/plugins/qmldesigner/designercore/include/import.h
+++ b/src/plugins/qmldesigner/designercore/include/import.h
@@ -33,7 +33,7 @@
 #ifndef IMPORT_H
 #define IMPORT_H
 
-#include <QtCore/QString>
+#include <QString>
 #include <QStringList>
 
 #include "corelib_global.h"
diff --git a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h
index 55ae4e47b6..f9ceb8f1e8 100644
--- a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h
+++ b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h
@@ -33,7 +33,7 @@
 #ifndef IWIDGETPLUGIN_H
 #define IWIDGETPLUGIN_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define QMLDESIGNER_WIDGETPLUGIN_INTERFACE "com.Nokia.QmlDesigner.IWidgetPlugin.v10"
 
diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
index 6df6b55137..9d874acd66 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
@@ -38,7 +38,7 @@
 #include <QMultiHash>
 #include <QString>
 #include <QStringList>
-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>
 
 #include <nodemetainfo.h>
 #include "itemlibraryinfo.h"
diff --git a/src/plugins/qmldesigner/designercore/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
index f310cb101c..1cd7c4f61d 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfoparser.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
@@ -34,9 +34,9 @@
 #define METAINFOPARSER_H
 
 #include "corelib_global.h"
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QString>
-#include <QtCore/QFile>
+#include <QXmlStreamReader>
+#include <QString>
+#include <QFile>
 #include <metainfo.h>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index b2192c975b..dc9ab652b0 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -34,10 +34,10 @@
 #define DESIGNERMODEL_H
 
 #include <corelib_global.h>
-#include <QtCore/QObject>
-#include <QtCore/QMimeData>
-#include <QtCore/QPair>
-#include <QtDeclarative/QDeclarativeError>
+#include <QObject>
+#include <QMimeData>
+#include <QPair>
+#include <QDeclarativeError>
 
 #include <import.h>
 
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index 7a610701ae..635922f12b 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -35,8 +35,8 @@
 
 #include "corelib_global.h"
 #include <QWeakPointer>
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
+#include <QList>
+#include <QMetaType>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmldesigner/designercore/include/propertybinding.h b/src/plugins/qmldesigner/designercore/include/propertybinding.h
index 6a056999f2..b859665ec8 100644
--- a/src/plugins/qmldesigner/designercore/include/propertybinding.h
+++ b/src/plugins/qmldesigner/designercore/include/propertybinding.h
@@ -33,9 +33,9 @@
 #ifndef PROPERTYBINDING_H
 #define PROPERTYBINDING_H
 
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QString>
+#include <QMetaType>
+#include <QSharedPointer>
+#include <QString>
 
 #include "corelib_global.h"
 #include "modelnode.h"
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index d3a6dffd26..cfaa5bee83 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -37,11 +37,11 @@
 #include "abstractview.h"
 #include "exception.h"
 #include <modelnodepositionstorage.h>
-#include <QtCore/QHash>
-#include <QtCore/QMap>
+#include <QHash>
+#include <QMap>
 #include <QPointer>
 #include <QWeakPointer>
-#include <QtCore/QHash>
+#include <QHash>
 
 #include <modelnode.h>
 #include <QScopedPointer>
diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h
index 2e492eab8b..fe935dede0 100644
--- a/src/plugins/qmldesigner/designercore/include/textmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h
@@ -37,10 +37,10 @@
 
 #include <qmljs/qmljsdocument.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
+#include <QByteArray>
+#include <QObject>
+#include <QTextCursor>
+#include <QTextDocument>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
index 9b5c52c97c..60e0215ed1 100644
--- a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
+++ b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
@@ -36,11 +36,11 @@
 #include "corelib_global.h"
 #include "nodeinstanceview.h"
 #include "propertycontainer.h"
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtGui/QImage>
+#include <QHash>
+#include <QList>
+#include <QString>
+#include <QVariant>
+#include <QImage>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
index 05731d7cb7..5d8fc4c054 100644
--- a/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
+++ b/src/plugins/qmldesigner/designercore/model/copyhelper.cpp
@@ -30,8 +30,8 @@
 **
 **************************************************************************/
 
-#include <QtCore/QBuffer>
-#include <QtCore/QDataStream>
+#include <QBuffer>
+#include <QDataStream>
 
 #include "copyhelper.h"
 #include "internalnode_p.h"
diff --git a/src/plugins/qmldesigner/designercore/model/copyhelper.h b/src/plugins/qmldesigner/designercore/model/copyhelper.h
index 7198f415f5..895ecf4efd 100644
--- a/src/plugins/qmldesigner/designercore/model/copyhelper.h
+++ b/src/plugins/qmldesigner/designercore/model/copyhelper.h
@@ -33,10 +33,10 @@
 #ifndef COPYHELPER_H
 #define COPYHELPER_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QMimeData>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QMimeData>
+#include <QSet>
+#include <QString>
 
 #include "internalnodestate.h"
 #include "textlocation.h"
diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp
index 4778509a4b..b16b870d5a 100644
--- a/src/plugins/qmldesigner/designercore/model/import.cpp
+++ b/src/plugins/qmldesigner/designercore/model/import.cpp
@@ -30,7 +30,7 @@
 **
 **************************************************************************/
 
-#include <QtCore/QHash>
+#include <QHash>
 
 #include "import.h"
 
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 2f3747c2a6..c34b901b7a 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -36,14 +36,14 @@
 #include "invalidpropertyexception.h"
 #include "invalidargumentexception.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QByteArray>
+#include <QFile>
+#include <QByteArray>
 #include <QWeakPointer>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
-#include <QtGui/QUndoStack>
-#include <QtXml/QXmlStreamReader>
-#include <QtCore/QDebug>
+#include <QUndoStack>
+#include <QXmlStreamReader>
+#include <QDebug>
 #include <QPlainTextEdit>
 #include <QHashIterator>
 
diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h
index cce3a38e3d..990b8992b6 100644
--- a/src/plugins/qmldesigner/designercore/model/model_p.h
+++ b/src/plugins/qmldesigner/designercore/model/model_p.h
@@ -33,10 +33,10 @@
 #ifndef MODEL_P_H
 #define MODEL_P_H
 
-#include <QtCore/QList>
+#include <QList>
 #include <QWeakPointer>
-#include <QtCore/QSet>
-#include <QtCore/QUrl>
+#include <QSet>
+#include <QUrl>
 
 #include "modelnode.h"
 #include "abstractview.h"
diff --git a/src/plugins/qmldesigner/designercore/model/modelrewriter.h b/src/plugins/qmldesigner/designercore/model/modelrewriter.h
index 50b3d15f2a..5a711e75b7 100644
--- a/src/plugins/qmldesigner/designercore/model/modelrewriter.h
+++ b/src/plugins/qmldesigner/designercore/model/modelrewriter.h
@@ -33,10 +33,10 @@
 #ifndef MODELREWRITER_H
 #define MODELREWRITER_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QMimeData>
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
+#include <QByteArray>
+#include <QMimeData>
+#include <QObject>
+#include <QUrl>
 
 #include "anchorline.h"
 #include "import.h"
diff --git a/src/plugins/qmldesigner/designercore/model/parsedqml.h b/src/plugins/qmldesigner/designercore/model/parsedqml.h
index 20aa388bb8..d9a8f7a39d 100644
--- a/src/plugins/qmldesigner/designercore/model/parsedqml.h
+++ b/src/plugins/qmldesigner/designercore/model/parsedqml.h
@@ -33,7 +33,7 @@
 #ifndef PARSEDQML_H
 #define PARSEDQML_H
 
-#include <QtCore/QString>
+#include <QString>
 
 #include <qmljsengine_p.h>
 #include <qmljslexer_p.h>
diff --git a/src/plugins/qmldesigner/designercore/model/paster.cpp b/src/plugins/qmldesigner/designercore/model/paster.cpp
index 22b585b881..6955391a3e 100644
--- a/src/plugins/qmldesigner/designercore/model/paster.cpp
+++ b/src/plugins/qmldesigner/designercore/model/paster.cpp
@@ -30,9 +30,9 @@
 **
 **************************************************************************/
 
-#include <QtCore/QByteArray>
-#include <QtCore/QDataStream>
-#include <QtCore/QSet>
+#include <QByteArray>
+#include <QDataStream>
+#include <QSet>
 
 #include "changeimportsvisitor.h"
 #include "copypasteutil.h"
diff --git a/src/plugins/qmldesigner/designercore/model/paster.h b/src/plugins/qmldesigner/designercore/model/paster.h
index 7d78e843fd..bea719c99c 100644
--- a/src/plugins/qmldesigner/designercore/model/paster.h
+++ b/src/plugins/qmldesigner/designercore/model/paster.h
@@ -33,10 +33,10 @@
 #ifndef PASTER_H
 #define PASTER_H
 
-#include <QtCore/QList>
-#include <QtCore/QMimeData>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QList>
+#include <QMimeData>
+#include <QSet>
+#include <QString>
 
 #include "import.h"
 #include "internalnode_p.h"
diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
index a895d0878d..568f8a4a61 100644
--- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
@@ -36,10 +36,10 @@
 #include <extensionsystem/pluginmanager.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QUndoStack>
+#include <QPlainTextEdit>
+#include <QUndoStack>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace Utils;
 using namespace QmlDesigner;
diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.h b/src/plugins/qmldesigner/designercore/model/propertyparser.h
index 166d2aef87..ebb4c572f4 100644
--- a/src/plugins/qmldesigner/designercore/model/propertyparser.h
+++ b/src/plugins/qmldesigner/designercore/model/propertyparser.h
@@ -33,7 +33,7 @@
 #ifndef PROPERTYPARSER_H
 #define PROPERTYPARSER_H
 
-#include <QtCore/QVariant>
+#include <QVariant>
 
 namespace QmlDesigner {
 class MetaInfo;
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 4ca007b288..ae4fb17663 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -30,8 +30,8 @@
 **
 **************************************************************************/
 
-#include <QtCore/QVariant>
-#include <QtGui/QColor>
+#include <QVariant>
+#include <QColor>
 
 #include "bindingproperty.h"
 #include "nodeproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
index 1e27b5f86d..f96bc5a9be 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h
@@ -33,8 +33,8 @@
 #ifndef QMLTEXTGENERATOR_H
 #define QMLTEXTGENERATOR_H
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 
 #include "abstractproperty.h"
 #include "modelnode.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
index 223a24014a..9ec4e05d44 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp
@@ -30,7 +30,7 @@
 **
 **************************************************************************/
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 9070861fd9..46a836d047 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -30,7 +30,7 @@
 **
 **************************************************************************/
 
-#include <QtCore/QSet>
+#include <QSet>
 
 #include "modelnode.h"
 #include "nodelistproperty.h"
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
index fb52869396..fd5409d667 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h
@@ -33,7 +33,7 @@
 #ifndef REWRITEACTIONCOMPRESSOR_H
 #define REWRITEACTIONCOMPRESSOR_H
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 #include "rewriteaction.h"
 
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 82de677cb5..d478cb7a49 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -56,8 +56,8 @@
 #include <qmljs/qmljsutils.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
-#include <QtCore/QSet>
-#include <QtGui/QMessageBox>
+#include <QSet>
+#include <QMessageBox>
 #include <QDir>
 
 using namespace LanguageUtils;
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
index 6c17ae68cf..ccd003bd2f 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
@@ -41,8 +41,8 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsscopechain.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QStringList>
+#include <QTimer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
index abb3059ff6..610de75d21 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.cpp
@@ -34,19 +34,19 @@
 #include "widgetpluginpath.h"
 #include <iwidgetplugin.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
-#include <QtCore/QDir>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QObject>
+#include <QSharedData>
+#include <QDir>
+#include <QStringList>
+#include <QDebug>
 #include <QWeakPointer>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibraryInfo>
+#include <QPluginLoader>
+#include <QFileInfo>
+#include <QLibraryInfo>
 
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QStandardItem>
+#include <QStandardItemModel>
+#include <QStandardItem>
 
 enum { debug = 0 };
 
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
index 3bd641fd75..a8d353f408 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h
@@ -33,8 +33,8 @@
 #ifndef WIDGETPLUGINMANAGER_H
 #define WIDGETPLUGINMANAGER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
index 653f54c15d..4460ae2bd2 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
@@ -32,14 +32,14 @@
 
 #include "widgetpluginpath.h"
 #include <iwidgetplugin.h>
-#include <QtCore/QLibrary>
+#include <QLibrary>
 #include <QWeakPointer>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QObject>
-#include <QtCore/QSharedData>
+#include <QPluginLoader>
+#include <QFileInfo>
+#include <QLibraryInfo>
+#include <QCoreApplication>
+#include <QObject>
+#include <QSharedData>
 #include <QDebug>
 
 enum { debug = 0 };
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
index d786dc4628..42519e9467 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h
@@ -35,11 +35,11 @@
 
 #include "widgetpluginmanager.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QWeakPointer>
-#include <QtCore/QList>
-#include <QtCore/QDir>
-#include <QtGui/QStandardItem>
+#include <QList>
+#include <QDir>
+#include <QStandardItem>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index 3f5b31bb0c..6defe845cb 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -33,7 +33,7 @@
 #include "designersettings.h"
 #include "qmldesignerconstants.h"
 
-#include <QtCore/QSettings>
+#include <QSettings>
 
 using namespace QmlDesigner;
 
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index c0a2d33e1e..748138e7ff 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -34,7 +34,7 @@
 #ifndef DESIGNERSETTINGS_H
 #define DESIGNERSETTINGS_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index db3fff1eb8..5a10db3a61 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -62,19 +62,19 @@
 #include <utils/qtcassert.h>
 #include <utils/crumblepath.h>
 
-#include <QtCore/QSettings>
-#include <QtCore/QEvent>
-#include <QtCore/QDir>
-#include <QtGui/QApplication>
-#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/QProgressDialog>
+#include <QSettings>
+#include <QEvent>
+#include <QDir>
+#include <QApplication>
+#include <QPlainTextEdit>
+#include <QVBoxLayout>
+#include <QScrollArea>
+#include <QTabWidget>
+#include <QToolButton>
+#include <QMenu>
+#include <QClipboard>
+#include <QLabel>
+#include <QProgressDialog>
 
 using Core::MiniSplitter;
 using Core::IEditor;
diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h
index 95cd8d5fb0..baab1871b4 100644
--- a/src/plugins/qmldesigner/designmodewidget.h
+++ b/src/plugins/qmldesigner/designmodewidget.h
@@ -52,11 +52,11 @@
 
 #include <QWeakPointer>
 #include <QDeclarativeError>
-#include <QtCore/QHash>
-#include <QtGui/QWidget>
-#include <QtGui/QToolBar>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
+#include <QHash>
+#include <QWidget>
+#include <QToolBar>
+#include <QComboBox>
+#include <QLabel>
 
 QT_BEGIN_NAMESPACE
 class QStackedWidget;
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp
index 174bd5168d..909a56e26b 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "desktopplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
index 9bc0a5d814..670ab2a35e 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
@@ -34,7 +34,7 @@
 #define DESKTOPPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
index 22e1bb6649..614d78f049 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "extrasplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
index 8f49b6cb46..c07a71a14a 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
@@ -34,7 +34,7 @@
 #define EXTRASPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp
index 30276745e3..b208c2eed2 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "meegoplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
index 659331a2eb..dcd20664c6 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
@@ -34,7 +34,7 @@
 #define MEEGOPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index b2f1898d13..908c89b3d5 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -61,13 +61,13 @@
 
 #include <integrationcore.h>
 
-#include <QtGui/QAction>
+#include <QAction>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/qplugin.h>
-#include <QtCore/QDebug>
-#include <QtCore/QProcessEnvironment>
+#include <QFileInfo>
+#include <QCoreApplication>
+#include <qplugin.h>
+#include <QDebug>
+#include <QProcessEnvironment>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 4ca2c3acc7..4c7cd5fdee 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "qtquickplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativescalegrid_p_p.h>
 
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
index fb92e0f3cd..044cd8f47a 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
@@ -34,7 +34,7 @@
 #define QTQUICKPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 8f3cac9c55..20742fae36 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -37,8 +37,8 @@
 
 #include <qmljseditor/qmljseditorconstants.h>
 
-#include <QtCore/QTextStream>
-#include <QtGui/QCheckBox>
+#include <QTextStream>
+#include <QCheckBox>
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
diff --git a/src/plugins/qmldesigner/settingspage.h b/src/plugins/qmldesigner/settingspage.h
index f2163f975d..7ba938c5ce 100644
--- a/src/plugins/qmldesigner/settingspage.h
+++ b/src/plugins/qmldesigner/settingspage.h
@@ -38,7 +38,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
index aaa73249f8..d159a86ab1 100644
--- a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
+++ b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
@@ -34,10 +34,10 @@
 
 #include <utils/fileutils.h>
 
-#include <QtCore/QChildEvent>
-#include <QtCore/QFile>
-#include <QtGui/QTabWidget>
-#include <QtGui/QStackedWidget>
+#include <QChildEvent>
+#include <QFile>
+#include <QTabWidget>
+#include <QStackedWidget>
 #include <QDebug>
 
 StyledOutputpanePlaceHolder::StyledOutputpanePlaceHolder(Core::IMode *mode, QSplitter *parent) : Core::OutputPanePlaceHolder(mode, parent)
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp b/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp
index 7b32dcc49a..e63448a4dd 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.cpp
@@ -32,7 +32,7 @@
 
 #include "symbianplugin.h"
 #include <widgetplugin_helper.h>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
index 4f035f2f8a..125b87a1fa 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
@@ -34,7 +34,7 @@
 #define SymbianPLUGIN_H
 
 #include <iwidgetplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 namespace QmlDesigner {