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>

46 files changed, 138 insertions, 138 deletions

diff --git a/src/plugins/qmljseditor/jsfilewizard.cpp b/src/plugins/qmljseditor/jsfilewizard.cpp
index 8a58b7245b..a29a5af674 100644
--- a/src/plugins/qmljseditor/jsfilewizard.cpp
+++ b/src/plugins/qmljseditor/jsfilewizard.cpp
@@ -38,12 +38,12 @@
 #include <utils/qtcassert.h>
 #include <utils/filewizarddialog.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtGui/QWizard>
-#include <QtGui/QPushButton>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QCheckBox>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QWizard>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QCheckBox>
 
 namespace {
 class JsFileOptionsPage : public QWizardPage
diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
index 714bd030ec..a355f4ca1e 100644
--- a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
+++ b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
@@ -35,9 +35,9 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtGui/QTextBlock>
+#include <QTextBlock>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.h b/src/plugins/qmljseditor/qmlexpressionundercursor.h
index 64c92db0da..5371366bac 100644
--- a/src/plugins/qmljseditor/qmlexpressionundercursor.h
+++ b/src/plugins/qmljseditor/qmlexpressionundercursor.h
@@ -36,7 +36,7 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsdocument.h>
 
-#include <QtGui/QTextCursor>
+#include <QTextCursor>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp
index 3ee453ebd0..5456908c8e 100644
--- a/src/plugins/qmljseditor/qmlfilewizard.cpp
+++ b/src/plugins/qmljseditor/qmlfilewizard.cpp
@@ -34,8 +34,8 @@
 
 #include <qmljstools/qmljstoolsconstants.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <QFileInfo>
+#include <QTextStream>
 
 using namespace QmlJSEditor;
 
diff --git a/src/plugins/qmljseditor/qmljsautocompleter.cpp b/src/plugins/qmljseditor/qmljsautocompleter.cpp
index e4a016e990..96018c4989 100644
--- a/src/plugins/qmljseditor/qmljsautocompleter.cpp
+++ b/src/plugins/qmljseditor/qmljsautocompleter.cpp
@@ -34,11 +34,11 @@
 
 #include <qmljs/qmljsscanner.h>
 
-#include <QtCore/QChar>
-#include <QtCore/QLatin1Char>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
+#include <QChar>
+#include <QLatin1Char>
+#include <QTextDocument>
+#include <QTextCursor>
+#include <QTextBlock>
 
 using namespace QmlJSEditor;
 using namespace Internal;
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp
index 2c23ddc45c..f90da289a4 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.cpp
+++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp
@@ -56,14 +56,14 @@
 #include <qmljs/qmljscompletioncontextfinder.h>
 #include <qmljs/qmljsscopebuilder.h>
 
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QDirIterator>
-#include <QtCore/QStringList>
-#include <QtGui/QIcon>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
+#include <QtAlgorithms>
+#include <QDirIterator>
+#include <QStringList>
+#include <QIcon>
 
 using namespace QmlJS;
 using namespace QmlJSEditor;
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index 285fd85224..684918add5 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -42,10 +42,10 @@
 #include <texteditor/snippets/snippetassistcollector.h>
 #include <texteditor/codeassist/defaultassistinterface.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QVariant>
-#include <QtGui/QIcon>
+#include <QStringList>
+#include <QScopedPointer>
+#include <QVariant>
+#include <QIcon>
 
 namespace QmlJS {
 class Value;
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
index d2ae66345b..83bc4cf1c3 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -41,9 +41,9 @@
 #include <qmljs/qmljsutils.h>
 #include <qmljstools/qmljsrefactoringchanges.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
 
 using namespace QmlJS::AST;
 using namespace QmlJSEditor;
diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
index c59f469d0d..35b94b4984 100644
--- a/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
@@ -33,8 +33,8 @@
 #include "qmljscomponentnamedialog.h"
 #include "ui_qmljscomponentnamedialog.h"
 
-#include <QtCore/QFileInfo>
-#include <QtGui/QFileDialog>
+#include <QFileInfo>
+#include <QFileDialog>
 
 using namespace QmlJSEditor::Internal;
 
diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h
index aacf4e615f..b59536e9f7 100644
--- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h
+++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h
@@ -33,7 +33,7 @@
 #ifndef QMLJSCOMPONENTNAMEDIALOG_H
 #define QMLJSCOMPONENTNAMEDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 476c7aa9ff..5be159ff91 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -81,19 +81,19 @@
 #include <utils/uncommentselection.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QSignalMapper>
-#include <QtCore/QTimer>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QTextCodec>
-
-#include <QtGui/QMenu>
-#include <QtGui/QComboBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMainWindow>
-#include <QtGui/QToolBar>
-#include <QtGui/QTreeView>
+#include <QFileInfo>
+#include <QSignalMapper>
+#include <QTimer>
+#include <QScopedPointer>
+#include <QTextCodec>
+
+#include <QMenu>
+#include <QComboBox>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QMainWindow>
+#include <QToolBar>
+#include <QTreeView>
 
 enum {
     UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100,
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 4f561dddd6..b97f327083 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -42,8 +42,8 @@
 #include <texteditor/basetexteditor.h>
 #include <texteditor/quickfix.h>
 
-#include <QtCore/QSharedPointer>
-#include <QtCore/QModelIndex>
+#include <QSharedPointer>
+#include <QModelIndex>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
index 8db0ddd40c..f4055c506d 100644
--- a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
+++ b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
@@ -37,10 +37,10 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 
-#include <QtCore/QDebug>
-#include <QtGui/QAction>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMessageBox>
+#include <QDebug>
+#include <QAction>
+#include <QMainWindow>
+#include <QMessageBox>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h
index dbbda7df55..dda05bb967 100644
--- a/src/plugins/qmljseditor/qmljseditorconstants.h
+++ b/src/plugins/qmljseditor/qmljseditorconstants.h
@@ -33,7 +33,7 @@
 #ifndef QMLJSEDITOR_CONSTANTS_H
 #define QMLJSEDITOR_CONSTANTS_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 namespace QmlJSEditor {
 namespace Constants {
diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp
index 38e7abae50..e5b6d470ab 100644
--- a/src/plugins/qmljseditor/qmljseditorfactory.cpp
+++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp
@@ -46,12 +46,12 @@
 #include <coreplugin/infobar.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QMainWindow>
+#include <QFileInfo>
+#include <QDebug>
+#include <QSettings>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QMainWindow>
 
 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
diff --git a/src/plugins/qmljseditor/qmljseditorfactory.h b/src/plugins/qmljseditor/qmljseditorfactory.h
index 76f6ae602a..f5fa8e6c5f 100644
--- a/src/plugins/qmljseditor/qmljseditorfactory.h
+++ b/src/plugins/qmljseditor/qmljseditorfactory.h
@@ -35,7 +35,7 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 5e8a3804a8..6795134d62 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -72,14 +72,14 @@
 #include <utils/qtcassert.h>
 #include <utils/json.h>
 
-#include <QtCore/QtPlugin>
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtCore/QDir>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
+#include <QtPlugin>
+#include <QDebug>
+#include <QSettings>
+#include <QDir>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QMenu>
+#include <QAction>
 
 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index 3905f8b001..1633f0fd84 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -37,7 +37,7 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/id.h>
 
-#include <QtCore/QPointer>
+#include <QPointer>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp
index 49a024a1a5..d7abe55dc8 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -55,13 +55,13 @@
 
 #include "qmljseditorconstants.h"
 
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QtConcurrentMap>
-#include <QtCore/QDir>
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
+#include <QTime>
+#include <QTimer>
+#include <QtConcurrentRun>
+#include <QtConcurrentMap>
+#include <QDir>
+#include <QApplication>
+#include <QLabel>
 #include <utils/runextensions.h>
 
 #include <functional>
diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h
index e78314a97b..a525979651 100644
--- a/src/plugins/qmljseditor/qmljsfindreferences.h
+++ b/src/plugins/qmljseditor/qmljsfindreferences.h
@@ -33,11 +33,11 @@
 #ifndef QMLJSFINDREFERENCES_H
 #define QMLJSFINDREFERENCES_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QObject>
-#include <QtCore/QFuture>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QPointer>
+#include <QMutex>
+#include <QObject>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QPointer>
 #include <utils/filesearch.h>
 #include <qmljs/qmljsdocument.h>
 
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index 2638ce35e7..9956c754b1 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -32,9 +32,9 @@
 
 #include "qmljshighlighter.h"
 
-#include <QtCore/QSet>
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QDebug>
+#include <QSet>
+#include <QtAlgorithms>
+#include <QDebug>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h
index 04204c54e8..4cde6ba3cf 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.h
+++ b/src/plugins/qmljseditor/qmljshighlighter.h
@@ -37,9 +37,9 @@
 
 #include <qmljs/qmljsscanner.h>
 
-#include <QtCore/QVector>
-#include <QtCore/QSet>
-#include <QtGui/QSyntaxHighlighter>
+#include <QVector>
+#include <QSet>
+#include <QSyntaxHighlighter>
 
 #include <texteditor/basetextdocumentlayout.h>
 #include <texteditor/syntaxhighlighter.h>
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 2de341276d..4155aefb6a 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -52,7 +52,7 @@
 #include <texteditor/tooltip/tooltip.h>
 #include <texteditor/tooltip/tipcontents.h>
 
-#include <QtCore/QList>
+#include <QList>
 
 using namespace Core;
 using namespace QmlJS;
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index d21876b7ec..f095528999 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -36,7 +36,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <texteditor/basehoverhandler.h>
 
-#include <QtGui/QColor>
+#include <QColor>
 
 QT_BEGIN_NAMESPACE
 template <class> class QList;
diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp
index 4511c06049..8bd602dc2a 100644
--- a/src/plugins/qmljseditor/qmljsoutline.cpp
+++ b/src/plugins/qmljseditor/qmljsoutline.cpp
@@ -39,11 +39,11 @@
 #include <coreplugin/ifile.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtGui/QAction>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QTextBlock>
+#include <QDebug>
+#include <QSettings>
+#include <QAction>
+#include <QVBoxLayout>
+#include <QTextBlock>
 
 using namespace QmlJS;
 
diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h
index 407be39cf7..fee09f56a1 100644
--- a/src/plugins/qmljseditor/qmljsoutline.h
+++ b/src/plugins/qmljseditor/qmljsoutline.h
@@ -37,7 +37,7 @@
 
 #include <texteditor/ioutlinewidget.h>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
 namespace Core {
 class IEditor;
diff --git a/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
index 32312c70e6..bb3d0df82d 100644
--- a/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
+++ b/src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
@@ -34,7 +34,7 @@
 #include "qmloutlinemodel.h"
 
 #include <utils/annotateditemdelegate.h>
-#include <QtGui/QMenu>
+#include <QMenu>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp
index 8825eb167c..a8829557b9 100644
--- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp
+++ b/src/plugins/qmljseditor/qmljspreviewrunner.cpp
@@ -36,10 +36,10 @@
 #include <utils/qtcprocess.h>
 #include <utils/synchronousprocess.h>
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QApplication>
+#include <QMessageBox>
+#include <QApplication>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.h b/src/plugins/qmljseditor/qmljspreviewrunner.h
index 05417a649a..fb9401d830 100644
--- a/src/plugins/qmljseditor/qmljspreviewrunner.h
+++ b/src/plugins/qmljseditor/qmljspreviewrunner.h
@@ -33,7 +33,7 @@
 #ifndef QMLJSPREVIEWRUNNER_H
 #define QMLJSPREVIEWRUNNER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include <projectexplorer/applicationlauncher.h>
 
diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp
index 1993e85cd5..aa3dd8c020 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfix.cpp
@@ -41,7 +41,7 @@
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h
index 36ed61ae8e..c022b236e9 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.h
+++ b/src/plugins/qmljseditor/qmljsquickfix.h
@@ -40,7 +40,7 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljstools/qmljsrefactoringchanges.h>
 
-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>
 
 namespace ExtensionSystem {
 class IPlugin;
diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp
index bfca73b9d1..acfe03f52e 100644
--- a/src/plugins/qmljseditor/qmljsquickfixes.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp
@@ -41,7 +41,7 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljstools/qmljsrefactoringchanges.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmljseditor/qmljsreuse.cpp b/src/plugins/qmljseditor/qmljsreuse.cpp
index 4d9b9130d4..7e072af01b 100644
--- a/src/plugins/qmljseditor/qmljsreuse.cpp
+++ b/src/plugins/qmljseditor/qmljsreuse.cpp
@@ -32,8 +32,8 @@
 
 #include "qmljsreuse.h"
 
-#include <QtCore/QChar>
-#include <QtGui/QPainter>
+#include <QChar>
+#include <QPainter>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljsreuse.h b/src/plugins/qmljseditor/qmljsreuse.h
index 14f0ca74eb..4b722ed77f 100644
--- a/src/plugins/qmljseditor/qmljsreuse.h
+++ b/src/plugins/qmljseditor/qmljsreuse.h
@@ -33,8 +33,8 @@
 #ifndef QMLJSREUSE_H
 #define QMLJSREUSE_H
 
-#include <QtCore/QtGlobal>
-#include <QtGui/QIcon>
+#include <QtGlobal>
+#include <QIcon>
 
 QT_BEGIN_NAMESPACE
 class QChar;
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
index 6552e3a886..08384fadd0 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp
@@ -49,9 +49,9 @@
 #include <texteditor/fontsettings.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QThreadPool>
-#include <QtCore/QFutureInterface>
-#include <QtCore/QRunnable>
+#include <QThreadPool>
+#include <QFutureInterface>
+#include <QRunnable>
 
 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h
index c97e4666f8..b1c1503139 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.h
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h
@@ -34,7 +34,7 @@
 #define QMLJSSEMANTICHIGHLIGHTER_H
 
 #include <texteditor/semantichighlighter.h>
-#include <QtCore/QFutureWatcher>
+#include <QFutureWatcher>
 
 namespace QmlJS {
 class ScopeChain;
diff --git a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
index e0f6b014e0..0237e1ca86 100644
--- a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
+++ b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
@@ -35,10 +35,10 @@
 
 #include "qmljseditor.h"
 
-#include <QtCore/QWaitCondition>
-#include <QtCore/QModelIndex>
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
+#include <QWaitCondition>
+#include <QModelIndex>
+#include <QMutex>
+#include <QThread>
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.cpp b/src/plugins/qmljseditor/qmljssnippetprovider.cpp
index 632d1c49cd..4b4ad0f5af 100644
--- a/src/plugins/qmljseditor/qmljssnippetprovider.cpp
+++ b/src/plugins/qmljseditor/qmljssnippetprovider.cpp
@@ -43,8 +43,8 @@
 
 #include <qmljstools/qmljsindenter.h>
 
-#include <QtCore/QLatin1String>
-#include <QtCore/QCoreApplication>
+#include <QLatin1String>
+#include <QCoreApplication>
 
 using namespace QmlJSEditor;
 using namespace Internal;
diff --git a/src/plugins/qmljseditor/qmljswrapinloader.cpp b/src/plugins/qmljseditor/qmljswrapinloader.cpp
index 478d6e10ee..e1887bf2cd 100644
--- a/src/plugins/qmljseditor/qmljswrapinloader.cpp
+++ b/src/plugins/qmljseditor/qmljswrapinloader.cpp
@@ -41,9 +41,9 @@
 #include <qmljs/qmljsbind.h>
 #include <qmljstools/qmljsrefactoringchanges.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QCoreApplication>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index 8b5de46f96..fac663e44c 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -43,9 +43,9 @@
 #include <utils/qtcassert.h>
 
 #include <coreplugin/icore.h>
-#include <QtCore/QDebug>
-#include <QtCore/QTime>
-#include <QtCore/QMimeData>
+#include <QDebug>
+#include <QTime>
+#include <QMimeData>
 #include <typeinfo>
 
 using namespace QmlJS;
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h
index 09e605ddb0..9027c52ebc 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.h
+++ b/src/plugins/qmljseditor/qmloutlinemodel.h
@@ -38,7 +38,7 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsicons.h>
 
-#include <QtGui/QStandardItemModel>
+#include <QStandardItemModel>
 
 namespace QmlJS {
 class Value;
diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp
index 1bfb716c1f..ee168a0878 100644
--- a/src/plugins/qmljseditor/qmltaskmanager.cpp
+++ b/src/plugins/qmljseditor/qmltaskmanager.cpp
@@ -43,8 +43,8 @@
 #include <qmljseditor/qmljseditor.h>
 #include <qmljseditor/qmljseditoreditable.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QtConcurrentRun>
+#include <QDebug>
+#include <QtConcurrentRun>
 #include <utils/runextensions.h>
 
 using namespace QmlJS;
diff --git a/src/plugins/qmljseditor/qmltaskmanager.h b/src/plugins/qmljseditor/qmltaskmanager.h
index c4b8cd3751..e92942c054 100644
--- a/src/plugins/qmljseditor/qmltaskmanager.h
+++ b/src/plugins/qmljseditor/qmltaskmanager.h
@@ -37,12 +37,12 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QList>
+#include <QHash>
+#include <QString>
+#include <QFutureWatcher>
+#include <QTimer>
 
 namespace QmlJSEditor {
 class QmlJSTextEditorWidget;
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index 3c5d082bb4..7b98329583 100644
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -50,7 +50,7 @@
 #include <coreplugin/icore.h>
 #include <customcolordialog.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 using namespace AST;
diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
index f59a24a36c..40ebec1b63 100644
--- a/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
+++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.cpp
@@ -36,9 +36,9 @@
 #include <qmldesigner/qmldesignerconstants.h>
 #include <coreplugin/icore.h>
 
-#include <QtCore/QSettings>
-#include <QtCore/QTextStream>
-#include <QtGui/QCheckBox>
+#include <QSettings>
+#include <QTextStream>
+#include <QCheckBox>
 
 
 using namespace QmlJSEditor;
diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.h b/src/plugins/qmljseditor/quicktoolbarsettingspage.h
index 1f2ad3f361..bfa8e6e4d0 100644
--- a/src/plugins/qmljseditor/quicktoolbarsettingspage.h
+++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.h
@@ -36,7 +36,7 @@
 
 #include "ui_quicktoolbarsettingspage.h"
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;