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>
2012-02-15 10:42:41 +01:00
parent 9a9ba12028
commit 3fa55b7ab9
2353 changed files with 7872 additions and 7873 deletions
--- a/doc/api/examples/exampleplugin/example_global.h
+++ b/doc/api/examples/exampleplugin/example_global.h
@@ -1,7 +1,7 @@
 #ifndef EXAMPLE_GLOBAL_H
 #define EXAMPLE_GLOBAL_H

-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 #if defined(EXAMPLE_LIBRARY)
 #  define EXAMPLESHARED_EXPORT Q_DECL_EXPORT
--- a/doc/api/examples/exampleplugin/exampleplugin.cpp
+++ b/doc/api/examples/exampleplugin/exampleplugin.cpp
@@ -8,12 +8,12 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>

-#include <QtGui/QAction>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
+#include <QAction>
+#include <QMessageBox>
+#include <QMainWindow>
+#include <QMenu>

-#include <QtCore/QtPlugin>
+#include <QtPlugin>

 using namespace Example::Internal;

--- a/doc/api/examples/webpagewizard/webpagewizard.cpp
+++ b/doc/api/examples/webpagewizard/webpagewizard.cpp
@@ -4,12 +4,12 @@
 #include <utils/filewizarddialog.h>
 #include <utils/qtcassert.h>

-#include <QtCore/QXmlStreamWriter>
+#include <QXmlStreamWriter>

-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPlainTextEdit>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>

 namespace MyPlugin {
 namespace Internal {
--- a/doc/api/examples/webpagewizard/webpagewizard.h
+++ b/doc/api/examples/webpagewizard/webpagewizard.h
@@ -6,7 +6,7 @@
 #include "basefilewizard.h"
 #include "utils/filewizarddialog.h"

-#include <QtGui/QWizardPage>
+#include <QWizardPage>

 QT_BEGIN_NAMESPACE
 class QLineEdit;
--- a/doc/examples/batterystatus/main.cpp
+++ b/doc/examples/batterystatus/main.cpp
@@ -36,7 +36,7 @@
 **
 ****************************************************************************/

-#include <QtGui/QApplication>
+#include <QApplication>
 #include "qmlapplicationviewer.h"

 int main(int argc, char *argv[])
--- a/doc/examples/textfinder/main.cpp
+++ b/doc/examples/textfinder/main.cpp
@@ -38,7 +38,7 @@

 #include "textfinder.h"

-#include <QtGui/QApplication>
+#include <QApplication>

 int main(int argc, char *argv[])
 {
--- a/doc/examples/textfinder/textfinder.cpp
+++ b/doc/examples/textfinder/textfinder.cpp
@@ -39,10 +39,10 @@
 #include "textfinder.h"

 //! [1]
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
+#include <QFile>
+#include <QTextStream>
 //! [1]
-#include <QtGui/QMessageBox>
+#include <QMessageBox>

 //! [3]
 TextFinder::TextFinder(QWidget *parent)
--- a/doc/examples/textfinder/textfinder.h
+++ b/doc/examples/textfinder/textfinder.h
@@ -41,7 +41,7 @@

 #include "ui_textfinder.h"

-#include <QtGui/QWidget>
+#include <QWidget>

 namespace Ui
 {
--- a/doc/examples/transitions/main.cpp
+++ b/doc/examples/transitions/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "qmlapplicationviewer.h"

 int main(int argc, char *argv[])
--- a/share/qtcreator/dumper/dumper.cpp
+++ b/share/qtcreator/dumper/dumper.cpp
@@ -30,7 +30,7 @@
 **
 **************************************************************************/

-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 #if USE_QT_CORE
 #include <QDateTime>
--- a/share/qtcreator/dumper/dumper_p.h
+++ b/share/qtcreator/dumper/dumper_p.h
@@ -33,8 +33,8 @@
 #ifndef GDBMACROS_P_H
 #define GDBMACROS_P_H

-#include <QtCore/QObject>
-#include <QtCore/QPointer>
+#include <QObject>
+#include <QPointer>

 #ifndef QT_BOOTSTRAPPED

--- a/share/qtcreator/dumper/test/main.cpp
+++ b/share/qtcreator/dumper/test/main.cpp
@@ -30,16 +30,16 @@
 **
 **************************************************************************/

-#include <QtCore/QStringList>
-#include <QtCore/QLinkedList>
-#include <QtCore/QVector>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtCore/QVariant>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
+#include <QStringList>
+#include <QLinkedList>
+#include <QVector>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QMap>
+#include <QSet>
+#include <QVariant>
+#include <QFileInfo>
+#include <QCoreApplication>
 #include <QAction>

 #include <string>
--- a/share/qtcreator/qml/qmldump/main.cpp
+++ b/share/qtcreator/qml/qmldump/main.cpp
@@ -33,26 +33,26 @@
 // WARNING: This code is shared with the qmlplugindump tool code in Qt.
 //          Modifications to this file need to be applied there.

-#include <QtDeclarative/QtDeclarative>
-#include <QtDeclarative/private/qdeclarativemetatype_p.h>
-#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h>
-#include <QtDeclarative/QDeclarativeView>
+#include <QtDeclarative>
+#include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativeopenmetaobject_p.h>
+#include <QDeclarativeView>

-#include <QtGui/QApplication>
+#include <QApplication>

-#include <QtCore/QSet>
-#include <QtCore/QMetaObject>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QDebug>
-#include <QtCore/private/qobject_p.h>
-#include <QtCore/private/qmetaobject_p.h>
+#include <QSet>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <QDebug>
+#include <private/qobject_p.h>
+#include <private/qmetaobject_p.h>

 #include <iostream>

 #include "qmlstreamwriter.h"

 #ifdef QT_SIMULATOR
-#include <QtGui/private/qsimulatorconnection_p.h>
+#include <private/qsimulatorconnection_p.h>
 #endif

 #ifdef Q_OS_UNIX
--- a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp
+++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp
@@ -35,8 +35,8 @@

 #include "qmlstreamwriter.h"

-#include <QtCore/QBuffer>
-#include <QtCore/QStringList>
+#include <QBuffer>
+#include <QStringList>

 QmlStreamWriter::QmlStreamWriter(QByteArray *array)
    : m_indentDepth(0)
--- a/share/qtcreator/qml/qmldump/qmlstreamwriter.h
+++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.h
@@ -36,11 +36,11 @@
 #ifndef QMLSTREAMWRITER_H
 #define QMLSTREAMWRITER_H

-#include <QtCore/QIODevice>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QPair>
+#include <QIODevice>
+#include <QList>
+#include <QString>
+#include <QScopedPointer>
+#include <QPair>

 class QmlStreamWriter
 {
--- a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
@@ -33,8 +33,8 @@
 #ifndef ABSTRACTLIVEEDITTOOL_H
 #define ABSTRACTLIVEEDITTOOL_H

-#include <QtCore/QList>
-#include <QtCore/QObject>
+#include <QList>
+#include <QObject>

 QT_BEGIN_NAMESPACE
 class QMouseEvent;
--- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp
@@ -34,11 +34,11 @@
 #include "qdeclarativeviewinspector.h"
 #include "qmlinspectorconstants.h"

-#include <QtGui/QGraphicsPolygonItem>
+#include <QGraphicsPolygonItem>

-#include <QtCore/QTimer>
-#include <QtCore/QObject>
-#include <QtCore/QDebug>
+#include <QTimer>
+#include <QObject>
+#include <QDebug>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
@@ -35,8 +35,8 @@

 #include "livelayeritem.h"

-#include <QtCore/QObject>
-#include <QtCore/QWeakPointer>
+#include <QObject>
+#include <QWeakPointer>

 QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
 QT_FORWARD_DECLARE_CLASS(QPainter)
--- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp
@@ -33,13 +33,13 @@
 #include "colorpickertool.h"
 #include "qdeclarativeviewinspector.h"

-#include <QtGui/QMouseEvent>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QRectF>
-#include <QtGui/QRgb>
-#include <QtGui/QImage>
-#include <QtGui/QApplication>
-#include <QtGui/QPalette>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QRectF>
+#include <QRgb>
+#include <QImage>
+#include <QApplication>
+#include <QPalette>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h
@@ -35,7 +35,7 @@

 #include "abstractliveedittool.h"

-#include <QtGui/QColor>
+#include <QColor>

 QT_FORWARD_DECLARE_CLASS(QPoint)

--- a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h
@@ -33,7 +33,7 @@
 #ifndef LIVELAYERITEM_H
 #define LIVELAYERITEM_H

-#include <QtGui/QGraphicsObject>
+#include <QGraphicsObject>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp
@@ -33,9 +33,9 @@
 #include "liverubberbandselectionmanipulator.h"
 #include "../qdeclarativeviewinspector_p.h"

-#include <QtGui/QGraphicsItem>
+#include <QGraphicsItem>

-#include <QtCore/QDebug>
+#include <QDebug>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
@@ -36,7 +36,7 @@

 #include "liveselectionrectangle.h"

-#include <QtCore/QPointF>
+#include <QPointF>

 QT_FORWARD_DECLARE_CLASS(QGraphicsItem)

--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp
@@ -34,10 +34,10 @@
 #include "../qdeclarativeviewinspector_p.h"
 #include "qmlinspectorconstants.h"

-#include <QtGui/QGraphicsRectItem>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QPen>
+#include <QGraphicsRectItem>
+#include <QGraphicsObject>
+#include <QGraphicsScene>
+#include <QPen>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h
@@ -33,8 +33,8 @@
 #ifndef LIVESELECTIONINDICATOR_H
 #define LIVESELECTIONINDICATOR_H

-#include <QtCore/QWeakPointer>
-#include <QtCore/QHash>
+#include <QWeakPointer>
+#include <QHash>

 QT_BEGIN_NAMESPACE
 class QGraphicsObject;
--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp
@@ -33,12 +33,12 @@
 #include "liveselectionrectangle.h"
 #include "qmlinspectorconstants.h"

-#include <QtGui/QPen>
-#include <QtGui/QGraphicsRectItem>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QGraphicsScene>
+#include <QPen>
+#include <QGraphicsRectItem>
+#include <QGraphicsObject>
+#include <QGraphicsScene>

-#include <QtCore/QtDebug>
+#include <QtDebug>

 #include <cmath>

--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h
@@ -33,7 +33,7 @@
 #ifndef LIVESELECTIONRECTANGLE_H
 #define LIVESELECTIONRECTANGLE_H

-#include <QtCore/QWeakPointer>
+#include <QWeakPointer>

 QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
 QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem)
--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
@@ -35,18 +35,18 @@

 #include "../qdeclarativeviewinspector_p.h"

-#include <QtGui/QApplication>
-#include <QtGui/QWheelEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QClipboard>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QGraphicsObject>
+#include <QApplication>
+#include <QWheelEvent>
+#include <QMouseEvent>
+#include <QClipboard>
+#include <QMenu>
+#include <QAction>
+#include <QGraphicsObject>

-#include <QtDeclarative/QDeclarativeItem>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QDeclarativeItem>
+#include <QDeclarativeEngine>

-#include <QtCore/QDebug>
+#include <QDebug>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
@@ -39,8 +39,8 @@
 #include "livesingleselectionmanipulator.h"
 #include "liveselectionindicator.h"

-#include <QtCore/QList>
-#include <QtCore/QTime>
+#include <QList>
+#include <QTime>

 QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
 QT_FORWARD_DECLARE_CLASS(QMouseEvent)
--- a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h
@@ -33,8 +33,8 @@
 #ifndef LIVESINGLESELECTIONMANIPULATOR_H
 #define LIVESINGLESELECTIONMANIPULATOR_H

-#include <QtCore/QPointF>
-#include <QtCore/QList>
+#include <QPointF>
+#include <QList>

 QT_FORWARD_DECLARE_CLASS(QGraphicsItem);

--- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
@@ -33,7 +33,7 @@
 #include "subcomponentmasklayeritem.h"
 #include "qmlinspectorconstants.h"
 #include "qdeclarativeviewinspector.h"
-#include <QtGui/QPolygonF>
+#include <QPolygonF>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h
+++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h
@@ -33,7 +33,7 @@
 #ifndef SUBCOMPONENTMASKLAYERITEM_H
 #define SUBCOMPONENTMASKLAYERITEM_H

-#include <QtGui/QGraphicsPolygonItem>
+#include <QGraphicsPolygonItem>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
@@ -33,14 +33,14 @@
 #include "zoomtool.h"
 #include "../qdeclarativeviewinspector_p.h"

-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QAction>

-#include <QtCore/QRectF>
-#include <QtCore/QDebug>
+#include <QRectF>
+#include <QDebug>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
@@ -43,7 +43,7 @@
 // We mean it.
 //

-#include <QtScript/qscriptengineagent.h>
+#include <qscriptengineagent.h>

 #include "qt_private/qdeclarativedebugservice_p.h"

--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h
@@ -36,7 +36,7 @@
 #include "qmlinspectorconstants.h"
 #include "qmljsdebugger_global.h"

-#include <QtCore/QHash>
+#include <QHash>

 QT_FORWARD_DECLARE_CLASS(QColor)
 QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine)
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h
@@ -36,8 +36,8 @@
 #include "qmljsdebugger_global.h"
 #include "qmlinspectorconstants.h"

-#include <QtCore/QScopedPointer>
-#include <QtDeclarative/QDeclarativeView>
+#include <QScopedPointer>
+#include <QDeclarativeView>

 QT_FORWARD_DECLARE_CLASS(QDeclarativeItem)
 QT_FORWARD_DECLARE_CLASS(QMouseEvent)
--- a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
@@ -33,7 +33,7 @@
 #ifndef QMLJSDEBUGGER_GLOBAL_H
 #define QMLJSDEBUGGER_GLOBAL_H

-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 # if defined(BUILD_QMLJSDEBUGGER_LIB)
 #    define QMLJSDEBUGGER_EXPORT Q_DECL_EXPORT
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
@@ -33,7 +33,7 @@
 #define QDECLARATIVEDEBUGHELPER_P_H

 #include "../qmljsdebugger_global.h"
-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 QT_BEGIN_HEADER

--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
@@ -33,7 +33,7 @@
 #define QDECLARATIVEDEBUGSERVICE_H

 #include "../qmljsdebugger_global.h"
-#include <QtCore/qobject.h>
+#include <qobject.h>

 QT_BEGIN_HEADER

--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
@@ -36,8 +36,8 @@

 #include <qdeclarative.h>
 #include <qdeclarativeproperty.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qsharedpointer.h>
+#include <qobject.h>
+#include <qsharedpointer.h>

 QT_BEGIN_HEADER

--- a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
@@ -32,14 +32,14 @@
 #include "jsdebuggeragent.h"
 #include "qt_private/qdeclarativedebughelper_p.h"

-#include <QtCore/qdatetime.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qset.h>
-#include <QtCore/qurl.h>
-#include <QtScript/qscriptcontextinfo.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalueiterator.h>
+#include <qdatetime.h>
+#include <qdebug.h>
+#include <qcoreapplication.h>
+#include <qset.h>
+#include <qurl.h>
+#include <qscriptcontextinfo.h>
+#include <qscriptengine.h>
+#include <qscriptvalueiterator.h>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h
+++ b/share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h
@@ -33,10 +33,10 @@
 #ifndef INSPECTORPROTOCOL_H
 #define INSPECTORPROTOCOL_H

-#include <QtCore/QDebug>
-#include <QtCore/QMetaType>
-#include <QtCore/QMetaEnum>
-#include <QtCore/QObject>
+#include <QDebug>
+#include <QMetaType>
+#include <QMetaEnum>
+#include <QObject>

 namespace QmlJSDebugger {

--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp
@@ -41,15 +41,15 @@

 #include "qt_private/qdeclarativedebughelper_p.h"

-#include <QtDeclarative/QDeclarativeItem>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeExpression>
-#include <QtGui/QWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QApplication>
+#include <QDeclarativeItem>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
+#include <QDeclarativeExpression>
+#include <QWidget>
+#include <QVBoxLayout>
+#include <QMouseEvent>
+#include <QGraphicsObject>
+#include <QApplication>

 #include "qt_private/qdeclarativestate_p.h"

--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h
@@ -33,8 +33,8 @@
 #ifndef QDECLARATIVEVIEWINSPECTOR_P_H
 #define QDECLARATIVEVIEWINSPECTOR_P_H

-#include <QtCore/QWeakPointer>
-#include <QtCore/QPointF>
+#include <QWeakPointer>
+#include <QPointF>

 #include "qdeclarativeviewinspector.h"
 #include "qdeclarativeinspectorservice.h"
--- a/share/qtcreator/qml/qmlobserver/deviceorientation.h
+++ b/share/qtcreator/qml/qmlobserver/deviceorientation.h
@@ -32,7 +32,7 @@
 #ifndef ORIENTATION_H
 #define ORIENTATION_H

-#include <QtCore/QObject>
+#include <QObject>

 QT_BEGIN_NAMESPACE

--- a/share/qtcreator/qml/qmlobserver/loggerwidget.h
+++ b/share/qtcreator/qml/qmlobserver/loggerwidget.h
@@ -32,8 +32,8 @@
 #ifndef LOGGERWIDGET_H
 #define LOGGERWIDGET_H

-#include <QtGui/QMainWindow>
-#include <QtCore/QMetaType>
+#include <QMainWindow>
+#include <QMetaType>

 QT_BEGIN_NAMESPACE

--- a/share/qtcreator/qml/qmlobserver/proxysettings.cpp
+++ b/share/qtcreator/qml/qmlobserver/proxysettings.cpp
@@ -29,8 +29,8 @@
 **
 **************************************************************************/

-#include <QtGui/QIntValidator>
-#include <QtCore/QSettings>
+#include <QIntValidator>
+#include <QSettings>

 #include "proxysettings.h"

--- a/share/qtcreator/qml/qmlobserver/proxysettings.h
+++ b/share/qtcreator/qml/qmlobserver/proxysettings.h
@@ -32,8 +32,8 @@
 #ifndef PROXYSETTINGS_H
 #define PROXYSETTINGS_H

-#include <QtGui/QDialog>
-#include <QtNetwork/QNetworkProxy>
+#include <QDialog>
+#include <QNetworkProxy>
 #ifdef Q_WS_MAEMO_5
 #include "ui_proxysettings_maemo5.h"
 #else
--- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
+++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
@@ -30,14 +30,14 @@
 **************************************************************************/

 #include <qdeclarativetester.h>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QCryptographicHash>
+#include <qdeclarativeview.h>
+#include <QDeclarativeComponent>
+#include <QGraphicsObject>
+#include <QApplication>
+#include <QDebug>
+#include <QFile>
+#include <QDir>
+#include <QCryptographicHash>

 #ifndef NO_PRIVATE_HEADERS
 #include <private/qabstractanimation_p.h>
--- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h
+++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h
@@ -34,15 +34,15 @@

 #include <qmlruntime.h>

-#include <QtDeclarative/qdeclarativelist.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarativelist.h>
+#include <qdeclarative.h>

-#include <QtGui/QMouseEvent>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QImage>
-#include <QtCore/QUrl>
-#include <QtCore/QEvent>
-#include <QtCore/QAbstractAnimation>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QImage>
+#include <QUrl>
+#include <QEvent>
+#include <QAbstractAnimation>

 QT_BEGIN_NAMESPACE

--- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
+++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
@@ -57,39 +57,39 @@
 #include <qdeclarativeviewinspector.h>
 #include <qdeclarativeinspectorservice.h>

-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkCookieJar>
-#include <QtNetwork/QNetworkDiskCache>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkProxyFactory>
+#include <QNetworkReply>
+#include <QNetworkCookieJar>
+#include <QNetworkDiskCache>
+#include <QNetworkAccessManager>
+#include <QNetworkProxyFactory>

-#include <QtDeclarative/QDeclarativeComponent>
+#include <QDeclarativeComponent>

-#include <QtGui/QWidget>
-#include <QtGui/QApplication>
-#include <QtGui/QTextBrowser>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QProgressDialog>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QFileDialog>
-#include <QtGui/QInputDialog>
-#include <QtGui/QGraphicsObject>
-#include <QtGui/QKeyEvent>
+#include <QWidget>
+#include <QApplication>
+#include <QTextBrowser>
+#include <QVBoxLayout>
+#include <QProgressDialog>
+#include <QMenuBar>
+#include <QMenu>
+#include <QAction>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QGraphicsObject>
+#include <QKeyEvent>

-#include <QtCore/QSignalMapper>
-#include <QtCore/QSettings>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QBuffer>
-#include <QtCore/QTranslator>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QSignalMapper>
+#include <QSettings>
+#include <QXmlStreamReader>
+#include <QBuffer>
+#include <QTranslator>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QProcess>
+#include <QTimer>
+#include <QMutex>
+#include <QMutexLocker>

 #include "proxysettings.h"
 #include "deviceorientation.h"
--- a/share/qtcreator/qml/qmlobserver/qmlruntime.h
+++ b/share/qtcreator/qml/qmlobserver/qmlruntime.h
@@ -32,10 +32,10 @@
 #ifndef QDECLARATIVEVIEWER_H
 #define QDECLARATIVEVIEWER_H

-#include <QtGui/QMainWindow>
-#include <QtCore/QTimer>
-#include <QtCore/QTime>
-#include <QtCore/QList>
+#include <QMainWindow>
+#include <QTimer>
+#include <QTime>
+#include <QList>

 #include "loggerwidget.h"

--- a/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h
+++ b/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h
@@ -29,10 +29,10 @@
 **
 **************************************************************************/

-#include <QtGui/qplaintextedit.h>
-#include <QtGui/qtextedit.h>
-#include <QtGui/qabstractkineticscroller.h>
-#include <QtGui/qscrollarea.h>
+#include <qplaintextedit.h>
+#include <qtextedit.h>
+#include <qabstractkineticscroller.h>
+#include <qscrollarea.h>
 #include <QtDebug>

 #ifndef TEXTEDITAUTORESIZER_H
--- a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
@@ -58,7 +58,7 @@
 #include <QSGItem>
 #endif

-#include <QtDeclarative/QDeclarativeEngine>
+#include <QDeclarativeEngine>

 /*!
  \class QmlDesigner::NodeInstance
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
@@ -35,7 +35,7 @@
 #include <QApplication>
 #include <QStringList>
 #ifdef QT_SIMULATOR
-#include <QtGui/private/qsimulatorconnection_p.h>
+#include <private/qsimulatorconnection_p.h>
 #endif

 #include <qt4nodeinstanceclientproxy.h>
--- a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp
+++ b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp
@@ -8,20 +8,20 @@

 #include "html5applicationviewer.h"

-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsLinearLayout>
-#include <QtWebKit/QGraphicsWebView>
-#include <QtWebKit/QWebFrame>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QVBoxLayout>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsWebView>
+#include <QWebFrame>

 #ifdef TOUCH_OPTIMIZED_NAVIGATION
-#include <QtCore/QTimer>
-#include <QtGui/QGraphicsSceneMouseEvent>
-#include <QtWebKit/QWebElement>
+#include <QTimer>
+#include <QGraphicsSceneMouseEvent>
+#include <QWebElement>
 #include "navigationcontroller.h"
 #include "webtouchevent.h"
 #include "webtouchnavigation.h"
--- a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
+++ b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
@@ -9,8 +9,8 @@
 #ifndef HTML5APPLICATIONVIEWER_H
 #define HTML5APPLICATIONVIEWER_H

-#include <QtGui/QWidget>
-#include <QtCore/QUrl>
+#include <QWidget>
+#include <QUrl>

 class QGraphicsWebView;

--- a/share/qtcreator/templates/html5app/main.cpp
+++ b/share/qtcreator/templates/html5app/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "html5applicationviewer.h"

 int main(int argc, char *argv[])
--- a/share/qtcreator/templates/mobileapp/main.cpp
+++ b/share/qtcreator/templates/mobileapp/main.cpp
@@ -1,6 +1,6 @@
 #include "mainwindow.h"

-#include <QtGui/QApplication>
+#include <QApplication>

 int main(int argc, char *argv[])
 {
--- a/share/qtcreator/templates/mobileapp/mainwindow.cpp
+++ b/share/qtcreator/templates/mobileapp/mainwindow.cpp
@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>

 MainWindow::MainWindow(QWidget *parent)
    : QMainWindow(parent), ui(new Ui::MainWindow)
--- a/share/qtcreator/templates/mobileapp/mainwindow.h
+++ b/share/qtcreator/templates/mobileapp/mainwindow.h
@@ -1,7 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H

-#include <QtGui/QMainWindow>
+#include <QMainWindow>

 namespace Ui {
    class MainWindow;
--- a/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
+++ b/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
@@ -1,8 +1,8 @@
 #ifndef @COLLECTION_INCLUDE_GUARD@
 #define @COLLECTION_INCLUDE_GUARD@

-#include <QtDesigner/QtDesigner>
-#include <QtCore/qplugin.h>
+#include <QtDesigner>
+#include <qplugin.h>

 class @COLLECTION_PLUGIN_CLASS@ : public QObject, public QDesignerCustomWidgetCollectionInterface
 {
--- a/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp
+++ b/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp
@@ -1,7 +1,7 @@
 #include "@WIDGET_HEADER@"
 #include "@PLUGIN_HEADER@"

-#include <QtCore/QtPlugin>
+#include <QtPlugin>

@PLUGIN_CLASS@::@PLUGIN_CLASS@(QObject *parent)
    : QObject(parent)
--- a/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
+++ b/share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
@@ -1,7 +1,7 @@
 #ifndef @WIDGET_INCLUDE_GUARD@
 #define @WIDGET_INCLUDE_GUARD@

-#include <QtGui/@WIDGET_BASE_CLASS@>
+#include <@WIDGET_BASE_CLASS@>

 class @WIDGET_CLASS@ : public @WIDGET_BASE_CLASS@
 {
--- a/share/qtcreator/templates/qt4project/mywidget.h
+++ b/share/qtcreator/templates/qt4project/mywidget.h
@@ -1,7 +1,7 @@
 #ifndef %PRE_DEF%
 #define %PRE_DEF%

-#include <QtGui/%BASECLASS%>
+#include <%BASECLASS%>

 class %CLASS% : public %BASECLASS%
 {
--- a/share/qtcreator/templates/qt4project/mywidget_form.h
+++ b/share/qtcreator/templates/qt4project/mywidget_form.h
@@ -1,7 +1,7 @@
 #ifndef %PRE_DEF%
 #define %PRE_DEF%

-#include <QtGui/%BASECLASS%>
+#include <%BASECLASS%>

 namespace Ui
 {
--- a/share/qtcreator/templates/qtquickapp/main.cpp
+++ b/share/qtcreator/templates/qtquickapp/main.cpp
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "qmlapplicationviewer.h"

 Q_DECL_EXPORT int main(int argc, char *argv[])
--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -9,12 +9,12 @@

 #include "qmlapplicationviewer.h"

-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDir>
+#include <QFileInfo>
+#include <QApplication>
+#include <QDeclarativeComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>

 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN

--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
@@ -10,7 +10,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H

-#include <QtDeclarative/QDeclarativeView>
+#include <QDeclarativeView>

 class QmlApplicationViewer : public QDeclarativeView
 {
--- a/share/qtcreator/templates/wizards/qml-extension/object.cpp
+++ b/share/qtcreator/templates/wizards/qml-extension/object.cpp
@@ -1,6 +1,6 @@
 #include "%ObjectName:l%.%CppHeaderSuffix%"

-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>

 %ObjectName%::%ObjectName%(QDeclarativeItem *parent):
        QDeclarativeItem(parent)
--- a/share/qtcreator/templates/wizards/qml-extension/object.h
+++ b/share/qtcreator/templates/wizards/qml-extension/object.h
@@ -1,7 +1,7 @@
 #ifndef %ObjectName:u%_H
 #define %ObjectName:u%_H

-#include <QtDeclarative/QDeclarativeItem>
+#include <QDeclarativeItem>

 class %ObjectName% : public QDeclarativeItem
 {
--- a/share/qtcreator/templates/wizards/qml-extension/plugin.cpp
+++ b/share/qtcreator/templates/wizards/qml-extension/plugin.cpp
@@ -1,7 +1,7 @@
 #include "%ProjectName:l%_plugin.%CppHeaderSuffix%"
 #include "%ObjectName:l%.%CppHeaderSuffix%"

-#include <QtDeclarative/qdeclarative.h>
+#include <qdeclarative.h>

 void %ProjectName:s%Plugin::registerTypes(const char *uri)
 {
--- a/share/qtcreator/templates/wizards/qml-extension/plugin.h
+++ b/share/qtcreator/templates/wizards/qml-extension/plugin.h
@@ -1,7 +1,7 @@
 #ifndef %ProjectName:h%_PLUGIN_H
 #define %ProjectName:h%_PLUGIN_H

-#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QDeclarativeExtensionPlugin>

 class %ProjectName:s%Plugin : public QDeclarativeExtensionPlugin
 {
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
@@ -8,12 +8,12 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>

-#include <QtGui/QAction>
-#include <QtGui/QMessageBox>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenu>
+#include <QAction>
+#include <QMessageBox>
+#include <QMainWindow>
+#include <QMenu>

-#include <QtCore/QtPlugin>
+#include <QtPlugin>

 using namespace %PluginName%::Internal;

--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
@@ -1,7 +1,7 @@
 #ifndef %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%
 #define %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%

-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 #if defined(%PluginName:u%_LIBRARY)
 #  define %PluginName:u%SHARED_EXPORT Q_DECL_EXPORT
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -38,24 +38,24 @@
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>

-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QTextStream>
-#include <QtCore/QThreadPool>
-#include <QtCore/QTimer>
-#include <QtCore/QTranslator>
-#include <QtCore/QUrl>
-#include <QtCore/QVariant>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QLibraryInfo>
+#include <QSettings>
+#include <QTextStream>
+#include <QThreadPool>
+#include <QTimer>
+#include <QTranslator>
+#include <QUrl>
+#include <QVariant>

-#include <QtNetwork/QNetworkProxyFactory>
+#include <QNetworkProxyFactory>

-#include <QtGui/QApplication>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMessageBox>
+#include <QApplication>
+#include <QDesktopServices>
+#include <QMainWindow>
+#include <QMessageBox>

 #ifdef ENABLE_QT_BREAKPAD
 #include <qtsystemexceptionhandler.h>
--- a/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h
@@ -25,7 +25,7 @@
 #include <cstddef>

 #ifndef CPLUSPLUS_WITHOUT_QT
-#  include <QtCore/qglobal.h>
+#  include <qglobal.h>

 #  if defined(CPLUSPLUS_BUILD_LIB)
 #    define CPLUSPLUS_EXPORT Q_DECL_EXPORT
--- a/src/libs/3rdparty/precompiled_headers/botan_pch.h
+++ b/src/libs/3rdparty/precompiled_headers/botan_pch.h
@@ -31,7 +31,7 @@
 **************************************************************************/

 #if defined __cplusplus
-#include <QtCore/QtGlobal>
+#include <QtGlobal>

 #ifdef Q_WS_WIN
 # define _POSIX_
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -32,8 +32,8 @@

 #include "aggregate.h"

-#include <QtCore/QWriteLocker>
-#include <QtCore/QDebug>
+#include <QWriteLocker>
+#include <QDebug>

 /*!
    \namespace Aggregation
--- a/src/libs/aggregation/aggregate.h
+++ b/src/libs/aggregation/aggregate.h
@@ -35,11 +35,11 @@

 #include "aggregation_global.h"

-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QReadLocker>
+#include <QObject>
+#include <QList>
+#include <QHash>
+#include <QReadWriteLock>
+#include <QReadLocker>

 namespace Aggregation {

--- a/src/libs/aggregation/aggregation_global.h
+++ b/src/libs/aggregation/aggregation_global.h
@@ -33,7 +33,7 @@
 #ifndef AGGREGATION_GLOBAL_H
 #define AGGREGATION_GLOBAL_H

-#include <QtCore/qglobal.h>
+#include <qglobal.h>

 #if defined(AGGREGATION_LIBRARY)
 #  define AGGREGATION_EXPORT Q_DECL_EXPORT
--- a/src/libs/aggregation/examples/text/main.cpp
+++ b/src/libs/aggregation/examples/text/main.cpp
@@ -32,7 +32,7 @@

 #include "main.h"

-#include <QtGui/QApplication>
+#include <QApplication>

 MyMain::MyMain(QWidget *parent, Qt::WFlags flags)
    : QWidget(parent, flags)
--- a/src/libs/aggregation/examples/text/main.h
+++ b/src/libs/aggregation/examples/text/main.h
@@ -38,7 +38,7 @@

 #include <aggregate.h>

-#include <QtGui/QWidget>
+#include <QWidget>

 class MyMain : public QWidget
 {
--- a/src/libs/aggregation/examples/text/myinterfaces.h
+++ b/src/libs/aggregation/examples/text/myinterfaces.h
@@ -35,7 +35,7 @@

 #include <aggregate.h>

-#include <QtCore/QString>
+#include <QString>

 class IComboEntry : public QObject
 {
--- a/src/libs/cplusplus/ASTParent.h
+++ b/src/libs/cplusplus/ASTParent.h
@@ -34,8 +34,8 @@
 #define CPLUSPLUS_ASTPARENT_H

 #include <ASTVisitor.h>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QHash>
+#include <QStack>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/ASTPath.cpp
+++ b/src/libs/cplusplus/ASTPath.cpp
@@ -36,7 +36,7 @@
 #include <TranslationUnit.h>

 #ifdef DEBUG_AST_PATH
-#  include <QtCore/QDebug>
+#  include <QDebug>
 #  include <typeinfo>
 #endif // DEBUG_AST_PATH

--- a/src/libs/cplusplus/ASTPath.h
+++ b/src/libs/cplusplus/ASTPath.h
@@ -38,8 +38,8 @@

 #include "CppDocument.h"

-#include <QtCore/QList>
-#include <QtGui/QTextCursor>
+#include <QList>
+#include <QTextCursor>

 #undef DEBUG_AST_PATH

--- a/src/libs/cplusplus/BackwardsScanner.cpp
+++ b/src/libs/cplusplus/BackwardsScanner.cpp
@@ -31,7 +31,7 @@
 **************************************************************************/
 #include "BackwardsScanner.h"
 #include <Token.h>
-#include <QtGui/QTextCursor>
+#include <QTextCursor>
 #include <QTextDocument>

 using namespace CPlusPlus;
--- a/src/libs/cplusplus/BackwardsScanner.h
+++ b/src/libs/cplusplus/BackwardsScanner.h
@@ -34,7 +34,7 @@

 #include "SimpleLexer.h"

-#include <QtGui/QTextBlock>
+#include <QTextBlock>

 QT_FORWARD_DECLARE_CLASS(QTextCursor)

--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -52,10 +52,10 @@
 #include <CoreTypes.h>
 #include <LookupContext.h>

-#include <QtCore/QByteArray>
-#include <QtCore/QBitArray>
-#include <QtCore/QDir>
-#include <QtCore/QtDebug>
+#include <QByteArray>
+#include <QBitArray>
+#include <QDir>
+#include <QtDebug>

 /*!
    \namespace CPlusPlus
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -36,11 +36,11 @@
 #include <CPlusPlusForwardDeclarations.h>
 #include "Macro.h"

-#include <QtCore/QSharedPointer>
-#include <QtCore/QDateTime>
-#include <QtCore/QHash>
-#include <QtCore/QFileInfo>
-#include <QtCore/QAtomicInt>
+#include <QSharedPointer>
+#include <QDateTime>
+#include <QHash>
+#include <QFileInfo>
+#include <QAtomicInt>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -39,9 +39,9 @@
 #include <Scope.h>
 #include <Overview.h>

-#include <QtCore/QVarLengthArray>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QVarLengthArray>
+#include <QRegExp>
+#include <QDebug>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/DependencyTable.cpp
+++ b/src/libs/cplusplus/DependencyTable.cpp
@@ -33,7 +33,7 @@
 #include "DependencyTable.h"
 #include "CppDocument.h"

-#include <QtCore/QDebug>
+#include <QDebug>

 using namespace CPlusPlus;

--- a/src/libs/cplusplus/DependencyTable.h
+++ b/src/libs/cplusplus/DependencyTable.h
@@ -35,11 +35,11 @@

 #include <CPlusPlusForwardDeclarations.h>

-#include <QtCore/QBitArray>
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QBitArray>
+#include <QHash>
+#include <QString>
+#include <QStringList>
+#include <QVector>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
@@ -40,8 +40,8 @@
 #include <CoreTypes.h>
 #include <Literals.h>

-#include <QtCore/QVarLengthArray>
-#include <QtCore/QDebug>
+#include <QVarLengthArray>
+#include <QDebug>

 using namespace CPlusPlus;

--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
@@ -37,9 +37,9 @@
 #include <NameVisitor.h>
 #include <FullySpecifiedType.h>

-#include <QtCore/QList>
-#include <QtCore/QPair>
-#include <QtCore/QSharedPointer>
+#include <QList>
+#include <QPair>
+#include <QSharedPointer>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/ExpressionUnderCursor.h
+++ b/src/libs/cplusplus/ExpressionUnderCursor.h
@@ -34,7 +34,7 @@
 #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H

 #include "CPlusPlusForwardDeclarations.h"
-#include <QtCore/QList>
+#include <QList>

 QT_BEGIN_NAMESPACE
 class QString;
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -33,7 +33,7 @@
 #include "FastPreprocessor.h"
 #include <Literals.h>
 #include <TranslationUnit.h>
-#include <QtCore/QDebug>
+#include <QDebug>

 using namespace CPlusPlus;

--- a/src/libs/cplusplus/FastPreprocessor.h
+++ b/src/libs/cplusplus/FastPreprocessor.h
@@ -39,8 +39,8 @@

 #include <Control.h>

-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QSet>
+#include <QString>

 namespace CPlusPlus {

--- a/src/libs/cplusplus/FindUsages.h
+++ b/src/libs/cplusplus/FindUsages.h
@@ -37,7 +37,7 @@
 #include "CppDocument.h"
 #include "TypeOfExpression.h"
 #include <ASTVisitor.h>
-#include <QtCore/QSet>
+#include <QSet>

 namespace CPlusPlus {

--- a/Show More
+++ b/Show More