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/libs/qmljs/jsoncheck.cpp

@@ -35,10 +35,10 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QLatin1String>
-#include <QtCore/QRegExp>
-#include <QtCore/QMap>
+#include <QDebug>
+#include <QLatin1String>
+#include <QRegExp>
+#include <QMap>
 
 #include <cmath>
 

src/libs/qmljs/jsoncheck.h

@@ -42,10 +42,10 @@
 
 #include <utils/json.h>
 
-#include <QtCore/QString>
-#include <QtCore/QSet>
-#include <QtCore/QStack>
-#include <QtCore/QList>
+#include <QString>
+#include <QSet>
+#include <QStack>
+#include <QList>
 
 
 namespace QmlJS {

src/libs/qmljs/parser/qmldirparser.cpp

@@ -34,9 +34,9 @@
 #include "qmlerror.h"
 bool Qml_isFileCaseCorrect(const QString &) { return true; }
 
-#include <QtCore/QTextStream>
-#include <QtCore/QFile>
-#include <QtCore/QtDebug>
+#include <QTextStream>
+#include <QFile>
+#include <QtDebug>
 
 QT_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmldirparser_p.h

@@ -44,8 +44,8 @@
 // We mean it.
 //
 
-#include <QtCore/QUrl>
-#include <QtCore/QHash>
+#include <QUrl>
+#include <QHash>
 
 #include "qmljsglobal_p.h"
 

src/libs/qmljs/parser/qmlerror.cpp

@@ -32,9 +32,9 @@
 
 #include "qmlerror.h"
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qstringlist.h>
+#include <qdebug.h>
+#include <qfile.h>
+#include <qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmlerror.h

@@ -33,8 +33,8 @@
 #ifndef QMLERROR_H
 #define QMLERROR_H
 
-#include <QtCore/qurl.h>
-#include <QtCore/qstring.h>
+#include <qurl.h>
+#include <qstring.h>
 
 QT_BEGIN_HEADER
 

src/libs/qmljs/parser/qmljsast_p.h

@@ -48,7 +48,7 @@
 #include "qmljsglobal_p.h"
 #include "qmljsmemorypool_p.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 QT_QML_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmljsastfwd_p.h

@@ -35,7 +35,7 @@
 
 #include "qmljsglobal_p.h"
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 //
 //  W A R N I N G

src/libs/qmljs/parser/qmljsglobal_p.h

@@ -32,7 +32,7 @@
 #ifndef QMLJSGLOBAL_P_H
 #define QMLJSGLOBAL_P_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #ifdef QT_CREATOR
 #  define QT_QML_BEGIN_NAMESPACE

src/libs/qmljs/parser/qmljsgrammar_p.h

@@ -46,7 +46,7 @@
 #define QMLJSGRAMMAR_P_H
 
 #include "qmljsglobal_p.h"
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmljslexer.cpp

@@ -34,9 +34,9 @@
 #include "qmljsengine_p.h"
 #include "qmljsmemorypool_p.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QVarLengthArray>
+#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);

src/libs/qmljs/parser/qmljslexer_p.h

@@ -46,7 +46,7 @@
 
 #include "qmljsglobal_p.h"
 #include "qmljsgrammar_p.h"
-#include <QtCore/QString>
+#include <QString>
 
 QT_QML_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmljsmemorypool_p.h

@@ -46,9 +46,9 @@
 
 #include "qmljsglobal_p.h"
 
-#include <QtCore/qglobal.h>
-#include <QtCore/qshareddata.h>
-#include <QtCore/qdebug.h>
+#include <qglobal.h>
+#include <qshareddata.h>
+#include <qdebug.h>
 
 #include <cstring>
 

src/libs/qmljs/parser/qmljsparser.cpp

@@ -30,8 +30,8 @@
 **
 **************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QCoreApplication>
+#include <QtDebug>
+#include <QCoreApplication>
 
 #include <string.h>
 

src/libs/qmljs/parser/qmljsparser_p.h

@@ -55,8 +55,8 @@
 #include "qmljsast_p.h"
 #include "qmljsengine_p.h"
 
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
 
 QT_QML_BEGIN_NAMESPACE
 

src/libs/qmljs/qmljs_global.h

@@ -33,7 +33,7 @@
 #ifndef QMLJS_GLOBAL_H
 #define QMLJS_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #if defined(QMLJS_BUILD_DIR)
 #  define QMLJS_EXPORT Q_DECL_EXPORT

src/libs/qmljs/qmljsbind.cpp

@@ -37,9 +37,9 @@
 
 #include <languageutils/componentversion.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QDebug>
 
 using namespace LanguageUtils;
 using namespace QmlJS;

src/libs/qmljs/qmljsbind.h

@@ -37,10 +37,10 @@
 #include <qmljs/qmljsinterpreter.h>
 #include <qmljs/qmljsvalueowner.h>
 
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QCoreApplication>
+#include <QHash>
+#include <QStringList>
+#include <QSharedPointer>
+#include <QCoreApplication>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljscheck.cpp

@@ -39,10 +39,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtGui/QColor>
-#include <QtGui/QApplication>
+#include <QDebug>
+#include <QDir>
+#include <QColor>
+#include <QApplication>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljscheck.h

@@ -40,10 +40,10 @@
 #include <qmljs/qmljsstaticanalysismessage.h>
 #include <qmljs/parser/qmljsastvisitor_p.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSet>
-#include <QtCore/QStack>
-#include <QtGui/QColor>
+#include <QCoreApplication>
+#include <QSet>
+#include <QStack>
+#include <QColor>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljscodeformatter.cpp

@@ -32,11 +32,11 @@
 
 #include "qmljscodeformatter.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QMetaEnum>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
+#include <QDebug>
+#include <QMetaEnum>
+#include <QTextDocument>
+#include <QTextCursor>
+#include <QTextBlock>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljscodeformatter.h

@@ -37,9 +37,9 @@
 
 #include "qmljsscanner.h"
 
-#include <QtCore/QStack>
-#include <QtCore/QList>
-#include <QtCore/QVector>
+#include <QStack>
+#include <QList>
+#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;

src/libs/qmljs/qmljscompletioncontextfinder.cpp

@@ -32,8 +32,8 @@
 
 #include "qmljscompletioncontextfinder.h"
 
-#include <QtCore/QDebug>
-#include <QtGui/QTextDocument>
+#include <QDebug>
+#include <QTextDocument>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljscompletioncontextfinder.h

@@ -36,8 +36,8 @@
 #include "qmljs_global.h"
 #include <qmljs/qmljslineinfo.h>
 
-#include <QtCore/QStringList>
-#include <QtGui/QTextCursor>
+#include <QStringList>
+#include <QTextCursor>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljscontext.h

@@ -36,7 +36,7 @@
 #include "qmljs_global.h"
 #include "qmljsvalueowner.h"
 
-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsdelta.cpp

@@ -37,8 +37,8 @@
 
 
 #include <typeinfo>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QStringList>
 
 
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsdocument.cpp

@@ -36,7 +36,7 @@
 #include <qmljs/parser/qmljslexer_p.h>
 #include <qmljs/parser/qmljsparser_p.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
-#include <QtCore/QDir>
+#include <QDir>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsdocument.h

@@ -32,10 +32,10 @@
 #ifndef QMLDOCUMENT_H
 #define QMLDOCUMENT_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QString>
+#include <QList>
+#include <QPair>
+#include <QSharedPointer>
+#include <QString>
 
 #include <languageutils/fakemetaobject.h>
 

src/libs/qmljs/qmljsevaluate.cpp

@@ -35,7 +35,7 @@
 #include "qmljsvalueowner.h"
 #include "qmljsscopechain.h"
 #include "parser/qmljsast_p.h"
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljsicons.cpp

@@ -31,10 +31,10 @@
 **************************************************************************/
 
 #include "qmljsicons.h"
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QHash>
-#include <QtCore/QPair>
+#include <QDebug>
+#include <QDir>
+#include <QHash>
+#include <QPair>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsicons.h

@@ -35,7 +35,7 @@
 
 #include <qmljs/qmljs_global.h>
 #include <qmljs/parser/qmljsast_p.h>
-#include <QtGui/QIcon>
+#include <QIcon>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsicontextpane.h

@@ -33,7 +33,7 @@
 #ifndef QMLJSICONTEXTPANE_H
 #define QMLJSICONTEXTPANE_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "qmljs_global.h"
 

src/libs/qmljs/qmljsindenter.cpp

@@ -71,8 +71,8 @@
 #include <qmljs/qmljsindenter.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtCore/QtDebug>
-#include <QtGui/QTextBlock>
+#include <QtDebug>
+#include <QTextBlock>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljsindenter.h

@@ -36,7 +36,7 @@
 #include <qmljs/qmljs_global.h>
 #include <qmljs/qmljslineinfo.h>
 
-#include <QtCore/QRegExp>
+#include <QRegExp>
 
 QT_FORWARD_DECLARE_CLASS(QTextBlock)
 

src/libs/qmljs/qmljsinterpreter.cpp

@@ -45,15 +45,15 @@
 #include <languageutils/fakemetaobject.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QMetaObject>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QProcess>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QDir>
+#include <QString>
+#include <QStringList>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <QXmlStreamReader>
+#include <QProcess>
+#include <QDebug>
 
 #include <algorithm>
 

src/libs/qmljs/qmljsinterpreter.h

@@ -39,12 +39,12 @@
 #include <qmljs/qmljs_global.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 
-#include <QtCore/QFileInfoList>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QMutex>
+#include <QFileInfoList>
+#include <QList>
+#include <QString>
+#include <QHash>
+#include <QSet>
+#include <QMutex>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljslineinfo.h

@@ -36,8 +36,8 @@
 #include <qmljs/qmljs_global.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtCore/QRegExp>
-#include <QtGui/QTextBlock>
+#include <QRegExp>
+#include <QTextBlock>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljslink.cpp

@@ -38,9 +38,9 @@
 #include "qmljsutils.h"
 #include "qmljsmodelmanagerinterface.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
 
 using namespace LanguageUtils;
 using namespace QmlJS;

src/libs/qmljs/qmljslink.h

@@ -38,7 +38,7 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <languageutils/componentversion.h>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -38,9 +38,9 @@
 
 #include <utils/environment.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QPointer>
+#include <QObject>
+#include <QStringList>
+#include <QPointer>
 
 namespace ProjectExplorer {
     class Project;

src/libs/qmljs/qmljspropertyreader.cpp

@@ -35,7 +35,7 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsutils.h>
 
-#include <QtGui/QLinearGradient>
+#include <QLinearGradient>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljspropertyreader.h

@@ -37,9 +37,9 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsdocument.h>
 
-#include <QtCore/QHash>
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QVariant>
+#include <QStringList>
 
 QT_FORWARD_DECLARE_CLASS(QLinearGradient)
 

src/libs/qmljs/qmljsreformatter.cpp

@@ -37,13 +37,13 @@
 #include "parser/qmljsast_p.h"
 #include "parser/qmljsastvisitor_p.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
+#include <QCoreApplication>
+#include <QString>
+#include <QFile>
+#include <QTextStream>
+#include <QTextBlock>
+#include <QTextDocument>
+#include <QTextCursor>
 
 #include <limits>
 

src/libs/qmljs/qmljsrewriter.cpp

@@ -38,9 +38,9 @@
 #include <utils/changeset.h>
 
 // ### FIXME: remove these includes:
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
+#include <QTextBlock>
+#include <QTextCursor>
+#include <QTextDocument>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsrewriter.h

@@ -37,7 +37,7 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <utils/changeset.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsscanner.cpp

@@ -32,7 +32,7 @@
 
 #include <qmljs/qmljsscanner.h>
 
-#include <QtGui/QTextCharFormat>
+#include <QTextCharFormat>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljsscanner.h

@@ -35,7 +35,7 @@
 
 #include <qmljs/qmljs_global.h>
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsscopebuilder.h

@@ -35,8 +35,8 @@
 
 #include <qmljs/qmljsdocument.h>
 
-#include <QtCore/QList>
-#include <QtCore/QStack>
+#include <QList>
+#include <QStack>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsscopechain.h

@@ -37,8 +37,8 @@
 #include "qmljsdocument.h"
 #include "qmljscontext.h"
 
-#include <QtCore/QList>
-#include <QtCore/QSharedPointer>
+#include <QList>
+#include <QSharedPointer>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsstaticanalysismessage.cpp

@@ -34,7 +34,7 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 using namespace QmlJS;
 using namespace QmlJS::StaticAnalysis;

src/libs/qmljs/qmljsstaticanalysismessage.h

@@ -36,9 +36,9 @@
 #include "qmljs_global.h"
 #include "parser/qmljsengine_p.h"
 
-#include <QtCore/QRegExp>
-#include <QtCore/QString>
-#include <QtCore/QList>
+#include <QRegExp>
+#include <QString>
+#include <QList>
 
 namespace QmlJS {
 namespace StaticAnalysis {

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -42,8 +42,8 @@
 #include "qmljsinterpreter.h"
 #include "qmljsutils.h"
 
-#include <QtCore/QIODevice>
-#include <QtCore/QBuffer>
+#include <QIODevice>
+#include <QBuffer>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljstypedescriptionreader.h

@@ -38,7 +38,7 @@
 #include "qmljsdocument.h"
 
 // for Q_DECLARE_TR_FUNCTIONS
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 QT_BEGIN_NAMESPACE
 class QIODevice;

src/libs/qmljs/qmljsutils.h

@@ -5,7 +5,7 @@
 #include "parser/qmljsastfwd_p.h"
 #include "parser/qmljsengine_p.h"
 
-#include <QtGui/QColor>
+#include <QColor>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsvalueowner.h

@@ -36,7 +36,7 @@
 #include "qmljs_global.h"
 #include "qmljsinterpreter.h"
 
-#include <QtCore/QList>
+#include <QList>
 
 namespace QmlJS {