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>

45 files changed, 122 insertions, 122 deletions

diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.h b/src/plugins/qt4projectmanager/qt-s60/abldparser.h
index 8e763946d3..fccf25feeb 100644
--- a/src/plugins/qt4projectmanager/qt-s60/abldparser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
index 2e21d7ae62..da96341795 100644
--- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp
@@ -33,7 +33,7 @@
 #include "certificatepathchooser.h"
 #include "s60certificateinfo.h"
 
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index ff5ca3dd93..7b433b33c1 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -49,14 +49,14 @@
 
 #include <symbianutils/symbiandevicemanager.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTimer>
+#include <QDir>
+#include <QFileInfo>
+#include <QTimer>
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
+#include <QMessageBox>
+#include <QMainWindow>
 
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index c2922029b7..8333292302 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -39,7 +39,7 @@
 #include <projectexplorer/toolchainmanager.h>
 #include <qtsupport/qtversionmanager.h>
 
-#include <QtCore/QDir>
+#include <QDir>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp
index f645a6a833..418101789d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp
@@ -32,12 +32,12 @@
 
 #include "passphraseforkeydialog.h"
 
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QVBoxLayout>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 using namespace Qt4ProjectManager;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
index 85b90bfbeb..242f240b3b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
+++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
@@ -33,7 +33,7 @@
 #ifndef PASSPHRASEFORKEYDIALOG_H
 #define PASSPHRASEFORKEYDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QDialogButtonBox)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
index 554c91958d..6c3107cdde 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp
@@ -47,8 +47,8 @@
 #include <projectexplorer/toolchain.h>
 #include <symbianutils/symbiandevicemanager.h>
 #include <extensionsystem/pluginmanager.h>
-#include <QtGui/QPainter>
-#include <QtGui/QApplication>
+#include <QPainter>
+#include <QApplication>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h
index 0923dd3d8c..5f4ef5519f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h
@@ -35,7 +35,7 @@
 
 #include "qt4target.h"
 
-#include <QtGui/QPixmap>
+#include <QPixmap>
 
 namespace Qt4ProjectManager {
 class Qt4Project;
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
index 4570c5da82..c13a10f395 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index 49a5e6a2a8..ae09bf3fff 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -42,11 +42,11 @@
 #include <utils/environmentmodel.h>
 #include <utils/synchronousprocess.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QProcess>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
+#include <QDir>
+#include <QFileInfo>
+#include <QProcess>
+#include <QGridLayout>
+#include <QLabel>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
index 7cec9f00b7..235959254f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h
@@ -33,7 +33,7 @@
 #ifndef S60CERTIFICATEDETAILSDIALOG_H
 #define S60CERTIFICATEDETAILSDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 struct S60CertificateDetailsDialogPrivate;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
index e66caccb30..fcc869948e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp
@@ -33,12 +33,12 @@
 #include "s60certificateinfo.h"
 #include "s60symbiancertificate.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextStream>
-#include <QtCore/QHash>
-#include <QtCore/QMutableHashIterator>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QCoreApplication>
+#include <QTextStream>
+#include <QHash>
+#include <QMutableHashIterator>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
index ef85065b86..8c73e18d79 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h
@@ -33,9 +33,9 @@
 #ifndef S60CERTIFICATEINFO_H
 #define S60CERTIFICATEINFO_H
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QtGlobal>
+#include <QObject>
+#include <QStringList>
+#include <QtGlobal>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h
index 96fec081e3..1df807014a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index 2652e7cf63..123fa418e6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -57,12 +57,12 @@
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/task.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QTimer>
-#include <QtCore/QCryptographicHash>
+#include <QDir>
+#include <QTimer>
+#include <QCryptographicHash>
 
-#include <QtCore/QSettings>
-#include <QtGui/QMessageBox>
+#include <QSettings>
+#include <QMessageBox>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
index 90f2012e67..1b943d2dcc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
@@ -38,8 +38,8 @@
 #include <projectexplorer/buildstep.h>
 #include <qt4projectmanager/makestep.h>
 
-#include <QtCore/QMutex>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QWaitCondition>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
index c0fb481aa5..f5ec79b453 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
@@ -50,7 +50,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/toolchain.h>
 
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
index b4ddb3904c..943700a0c6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
@@ -46,25 +46,25 @@
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QTimer>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QComboBox>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QFormLayout>
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QMessageBox>
-#include <QtGui/QCheckBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QValidator>
-
-#include <QtNetwork/QTcpSocket>
+#include <QDir>
+#include <QTimer>
+#include <QLabel>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QFormLayout>
+#include <QToolButton>
+#include <QStyle>
+#include <QApplication>
+#include <QSpacerItem>
+#include <QMessageBox>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QRadioButton>
+#include <QValidator>
+
+#include <QTcpSocket>
 
 Q_DECLARE_METATYPE(SymbianUtils::SymbianDevice)
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
index 45b452b87f..09645a8d40 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
@@ -35,8 +35,8 @@
 
 #include <projectexplorer/deployconfiguration.h>
 
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
+#include <QWidget>
+#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index 949086250a..1db4799c86 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -47,17 +47,17 @@
 #include <symbianutils/symbiandevicemanager.h>
 #include <utils/qtcassert.h>
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
+#include <QMessageBox>
+#include <QMainWindow>
 
-#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QEventLoop>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QTimer>
+#include <QDateTime>
+#include <QDir>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
 
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
 
 using namespace ProjectExplorer;
 using namespace SymbianUtils;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
index ccea6a1b55..1ba08c8762 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-#include <QtCore/QString>
+#include <QString>
 
 QT_FORWARD_DECLARE_CLASS(QEventLoop)
 QT_FORWARD_DECLARE_CLASS(QFile)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
index 8097234fb6..1f330d6317 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
@@ -44,7 +44,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 2f0db5fad6..49a688ad7b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -36,8 +36,8 @@
 #include <projectexplorer/runconfiguration.h>
 #include <qt4projectmanager/qt4projectmanager_global.h>
 
-#include <QtCore/QFutureInterface>
-#include <QtCore/QStringList>
+#include <QFutureInterface>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index 57742b073c..1da3a93ee0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -38,11 +38,11 @@
 
 #include <coreplugin/helpmanager.h>
 
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QFormLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QFormLayout>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
index 8bec123168..2677255476 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
@@ -33,8 +33,8 @@
 #ifndef S60DEVICERUNCONFIGURATIONWIDGET_H
 #define S60DEVICERUNCONFIGURATIONWIDGET_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
+#include <QWidget>
+#include <QLabel>
 
 QT_BEGIN_NAMESPACE
 class QLineEdit;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 54d151a40e..d6fd37d426 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -47,9 +47,9 @@
 #include <qtsupport/qtoutputformatter.h>
 #include <qtsupport/baseqtversion.h>
 
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QFormLayout>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QFormLayout>
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index 4bc00deda2..1ce10f83fd 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -36,8 +36,8 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/applicationlauncher.h>
 
-#include <QtCore/QVariantMap>
-#include <QtGui/QWidget>
+#include <QVariantMap>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index 3afa5cb682..703ea9df2b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -58,9 +58,9 @@
 #include <debugger/debuggerconstants.h>
 #include <utils/qtcassert.h>
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
-#include <QtCore/QDir>
+#include <QDir>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.h b/src/plugins/qt4projectmanager/qt-s60/s60manager.h
index 9a36f3b6dc..fc1ba2f4e2 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.h
@@ -33,7 +33,7 @@
 #ifndef S60MANAGER_H
 #define S60MANAGER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace ProjectExplorer {
 class ToolChain;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
index 80b1d58d70..32c0fcc57e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
@@ -50,7 +50,7 @@
 #include <utils/fileutils.h>
 #include <proparser/prowriter.h>
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
index 54c693a377..be158be934 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
@@ -32,8 +32,8 @@
 #ifndef S60PUBLISHEROVI_H
 #define S60PUBLISHEROVI_H
 
-#include <QtCore/QObject>
-#include <QtGui/QColor>
+#include <QObject>
+#include <QColor>
 
 QT_BEGIN_NAMESPACE
 class QProcess;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
index 2d88138b23..fbda8a5d12 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
@@ -40,7 +40,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
-#include <QtGui/QAbstractButton>
+#include <QAbstractButton>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
index 62bdbb4d26..1c8be1bd10 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h
@@ -33,7 +33,7 @@
 #ifndef S60PUBLISHINGBUILDSETTINGSPAGEOVI_H
 #define S60PUBLISHINGBUILDSETTINGSPAGEOVI_H
 
-#include <QtGui/QWizardPage>
+#include <QWizardPage>
 
 namespace ProjectExplorer {
 class Project;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp
index 187d66ce35..0cb1f12e0b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp
@@ -33,10 +33,10 @@
 #include "s60publisherovi.h"
 #include "ui_s60publishingresultspageovi.h"
 
-#include <QtGui/QDesktopServices>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QScrollBar>
-#include <QtCore/QProcess>
+#include <QDesktopServices>
+#include <QAbstractButton>
+#include <QScrollBar>
+#include <QProcess>
 
 namespace Qt4ProjectManager {
 namespace Internal {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
index 379f8c5ef8..19431c9dbf 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
@@ -35,7 +35,7 @@
 #include "s60publisherovi.h"
 #include "s60certificateinfo.h"
 
-#include <QtGui/QAbstractButton>
+#include <QAbstractButton>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
index db61b0acf6..f3a446595a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h
@@ -33,7 +33,7 @@
 #ifndef S60PUBLISHINGSISSETTINGSPAGEOVI_H
 #define S60PUBLISHINGSISSETTINGSPAGEOVI_H
 
-#include <QtGui/QWizardPage>
+#include <QWizardPage>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
index be16e88b55..30b6230b03 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
@@ -47,9 +47,9 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h
index 616fa5f239..5b64516402 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h
@@ -37,7 +37,7 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/toolchain.h>
 
-#include <QtCore/QFutureInterface>
+#include <QFutureInterface>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
index 0cafbd0c9f..6494d379fc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
@@ -50,7 +50,7 @@
 #include <memory>
 #include <string>
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 using namespace Botan;
 using namespace Qt4ProjectManager;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
index 5134ef131d..8700ff4efc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h
@@ -33,7 +33,7 @@
 #ifndef S60SYMBIANCERTIFICATE_H
 #define S60SYMBIANCERTIFICATE_H
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 QT_FORWARD_DECLARE_CLASS(QDateTime)
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h
index d1d20445f8..623d8fa3df 100644
--- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h
@@ -35,8 +35,8 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QXmlStreamReader>
+#include <QDir>
+#include <QXmlStreamReader>
 
 namespace ProjectExplorer {
 class TaskHub;
diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
index 6b408c2d60..a365ef9312 100644
--- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
@@ -44,11 +44,11 @@
 #include <utils/environment.h>
 #include <proparser/profileevaluator.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtGui/QLabel>
-#include <QtGui/QFormLayout>
+#include <QCoreApplication>
+#include <QDir>
+#include <QSettings>
+#include <QLabel>
+#include <QFormLayout>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp
index 40adcc588a..f4e9db3080 100644
--- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp
@@ -38,7 +38,7 @@
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtsupportconstants.h>
 
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h
index d254d61a05..2340993b9f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/ioutputparser.h>
 
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
index 2bea7e92d3..533f078ca7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
@@ -42,9 +42,9 @@
 #include <utils/environment.h>
 #include <qtsupport/qtversionmanager.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
+#include <QDir>
+#include <QFileInfo>
+#include <QStringList>
 
 namespace Qt4ProjectManager {
 namespace Internal {