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>

src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp

@@ -35,9 +35,9 @@
 #include <utils/filesystemwatcher.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtGui/QImageReader>
+#include <QDebug>
+#include <QDir>
+#include <QImageReader>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/fileformat/filefilteritems.h

@@ -35,11 +35,11 @@
 
 #include "qmlprojectitem.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QSet>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QSet>
+#include <QTimer>
 
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>
 
 QT_FORWARD_DECLARE_CLASS(QDir)
 

src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp

@@ -33,8 +33,8 @@
 #include "qmlprojectitem.h"
 #include "filefilteritems.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
+#include <QDebug>
+#include <QDir>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h

@@ -33,9 +33,9 @@
 #ifndef QMLPROJECTITEM_H
 #define QMLPROJECTITEM_H
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtDeclarative/qdeclarative.h>
+#include <QObject>
+#include <QStringList>
+#include <qdeclarative.h>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -52,9 +52,9 @@
 #include <projectexplorer/toolchainmanager.h>
 #include <utils/filesystemwatcher.h>
 
-#include <QtCore/QTextStream>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtCore/QtDebug>
+#include <QTextStream>
+#include <QDeclarativeComponent>
+#include <QtDebug>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/qmlproject.h

@@ -37,7 +37,7 @@
 
 #include <projectexplorer/project.h>
 
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QDeclarativeEngine>
 
 namespace QmlJS {
 class ModelManagerInterface;

src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

@@ -39,14 +39,14 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qtsupport/qtsupportconstants.h>
 
-#include <QtGui/QIcon>
+#include <QIcon>
 
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
+#include <QPainter>
+#include <QPixmap>
 
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtCore/QCoreApplication>
+#include <QDir>
+#include <QTextStream>
+#include <QCoreApplication>
 
 namespace QmlProjectManager {
 namespace Internal {

src/plugins/qmlprojectmanager/qmlprojectmanager.pro

@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = QmlProjectManager
 
-QT += declarative
+QT += declarative network
 
 include(../../qtcreatorplugin.pri)
 include(qmlprojectmanager_dependencies.pri)

src/plugins/qmlprojectmanager/qmlprojectmanager_global.h

@@ -33,7 +33,7 @@
 #ifndef QMLPROJECTMANAGER_GLOBAL_H
 #define QMLPROJECTMANAGER_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #if defined(QMLPROJECTMANAGER_LIBRARY)
 #  define QMLPROJECTMANAGER_EXPORT Q_DECL_EXPORT

src/plugins/qmlprojectmanager/qmlprojectnodes.cpp

@@ -38,10 +38,10 @@
 #include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/projectexplorer.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtGui/QStyle>
+#include <QFileInfo>
+#include <QDir>
+#include <QTextStream>
+#include <QStyle>
 
 namespace QmlProjectManager {
 namespace Internal {

src/plugins/qmlprojectmanager/qmlprojectnodes.h

@@ -35,8 +35,8 @@
 
 #include <projectexplorer/projectnodes.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
+#include <QStringList>
+#include <QHash>
 
 namespace Core {
 class IFile;

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -53,11 +53,11 @@
 
 #include <qtsupport/qtsupportconstants.h>
 
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
+#include <QApplication>
+#include <QMessageBox>
+#include <QPushButton>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

@@ -37,7 +37,7 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>
 
 QT_FORWARD_DECLARE_CLASS(QStringListModel)
 

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp

@@ -47,12 +47,12 @@
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QComboBox>
-#include <QtGui/QFormLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QStandardItemModel>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QStandardItemModel>
 
 using Core::ICore;
 using Utils::DebuggerLanguageChooser;

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h

@@ -33,7 +33,7 @@
 #ifndef QMLPROJECTRUNCONFIGURATIONWIDGET_H
 #define QMLPROJECTRUNCONFIGURATIONWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_FORWARD_DECLARE_CLASS(QComboBox)
 QT_FORWARD_DECLARE_CLASS(QStandardItemModel)

src/plugins/qmlprojectmanager/qmlprojecttarget.cpp

@@ -36,9 +36,9 @@
 #include "qmlprojectmanagerconstants.h"
 #include "qmlprojectrunconfiguration.h"
 
-#include <QtCore/QDebug>
-#include <QtGui/QApplication>
-#include <QtGui/QStyle>
+#include <QDebug>
+#include <QApplication>
+#include <QStyle>
 
 namespace QmlProjectManager {
 namespace Internal {

src/plugins/qmlprojectmanager/qmlprojecttarget.h

@@ -35,8 +35,8 @@
 
 #include <projectexplorer/target.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
+#include <QStringList>
+#include <QVariantMap>
 
 namespace QmlProjectManager {
 class QmlProject;