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/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

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;

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 {

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;
 

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;

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;

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;

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;

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;
 

src/plugins/qmljseditor/qmljscomponentnamedialog.h

@@ -33,7 +33,7 @@
 #ifndef QMLJSCOMPONENTNAMEDIALOG_H
 #define QMLJSCOMPONENTNAMEDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace QmlJSEditor {
 namespace Internal {

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 <QFileInfo>
+#include <QSignalMapper>
+#include <QTimer>
+#include <QScopedPointer>
+#include <QTextCodec>
 
-#include <QtGui/QMenu>
-#include <QtGui/QComboBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMainWindow>
-#include <QtGui/QToolBar>
-#include <QtGui/QTreeView>
+#include <QMenu>
+#include <QComboBox>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QMainWindow>
+#include <QToolBar>
+#include <QTreeView>
 
 enum {
     UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100,

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;

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 {

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 {

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;

src/plugins/qmljseditor/qmljseditorfactory.h

@@ -35,7 +35,7 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace QmlJSEditor {
 namespace Internal {

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;

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)
 

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>

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>
 

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>
 

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>

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;

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;

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;
 

src/plugins/qmljseditor/qmljsoutline.h

@@ -37,7 +37,7 @@
 
 #include <texteditor/ioutlinewidget.h>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
 namespace Core {
 class IEditor;

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 {

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 {

src/plugins/qmljseditor/qmljspreviewrunner.h

@@ -33,7 +33,7 @@
 #ifndef QMLJSPREVIEWRUNNER_H
 #define QMLJSPREVIEWRUNNER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include <projectexplorer/applicationlauncher.h>
 

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;

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;

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;

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 {

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;