diff options
Diffstat (limited to 'share/qtcreator/qml')
43 files changed, 176 insertions, 176 deletions
diff --git a/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp index 9a41c68446..d1ee7dc019 100644 --- 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 diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp index 2c9a7f01a9..4b0418828f 100644 --- 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) diff --git a/share/qtcreator/qml/qmldump/qmlstreamwriter.h b/share/qtcreator/qml/qmldump/qmlstreamwriter.h index b6d10cd0e4..f72d7fe3a0 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h b/share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h index c7d5b7514c..ac1fc6e493 100644 --- 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; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp index 8791bbc9be..5fabc97654 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h index 4cbbb9c4ba..2c502d0da8 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp index cf65fdf1c8..34d23a2653 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h index 7ad3080e04..974e1a227f 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h index a171c08284..e06e9d715e 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp index 95fef00047..8be37d632c 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h index 853327df12..78006763ee 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp index 5325e7dccf..956766aa73 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h index a71e8d13ac..be615fbbd3 100644 --- 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; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp index 8a992be77c..e4b810e033 100644 --- 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> diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h index a1f1f527d5..1020670be7 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp index e53b945af3..89490a1b18 100644 --- 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 <QtDeclarative/QDeclarativeItem> -#include <QtDeclarative/QDeclarativeEngine> - -#include <QtCore/QDebug> +#include <QApplication> +#include <QWheelEvent> +#include <QMouseEvent> +#include <QClipboard> +#include <QMenu> +#include <QAction> +#include <QGraphicsObject> + +#include <QDeclarativeItem> +#include <QDeclarativeEngine> + +#include <QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h index bf51f379b5..f277d81fda 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h index 92b003190b..7ffbace063 100644 --- 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); diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp index c295b4fcea..eb3afe5ae0 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h index 24c478d60e..66b2dfd77f 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp index bd9f1134be..69ee39f621 100644 --- 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 <QtCore/QRectF> -#include <QtCore/QDebug> +#include <QMouseEvent> +#include <QWheelEvent> +#include <QKeyEvent> +#include <QMenu> +#include <QAction> + +#include <QRectF> +#include <QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h index 68f535b502..e1b9974dd3 100644 --- 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" diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h index 1f56f94ccb..c2641d62d3 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h index e4021715b4..3029a8e077 100644 --- 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) diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h index e787218796..0e16c90ec8 100644 --- 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 diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h index aafd42cdbd..b96cfb2e29 100644 --- 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 diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h index c34c9b8acf..8ac68d1211 100644 --- 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 diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h index 3ad578b7f9..d02add178b 100644 --- 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 diff --git a/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp index 39420da193..0ad497d90f 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h b/share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h index e24209c286..0e3d1c6f04 100644 --- 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 { diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp index 0ef151c7c3..e1d440b74b 100644 --- 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" diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h index a1120bf510..d8d5e7db04 100644 --- 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" diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation.h b/share/qtcreator/qml/qmlobserver/deviceorientation.h index 2659c87f23..681f673a5f 100644 --- 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 diff --git a/share/qtcreator/qml/qmlobserver/loggerwidget.h b/share/qtcreator/qml/qmlobserver/loggerwidget.h index 5a6045b7c0..71932e778f 100644 --- 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 diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.cpp b/share/qtcreator/qml/qmlobserver/proxysettings.cpp index 0edacca46d..57b233917d 100644 --- 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" diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.h b/share/qtcreator/qml/qmlobserver/proxysettings.h index 679213e888..9c1714caa6 100644 --- 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 diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp index 292af7669b..c3a2e3931b 100644 --- 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> diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h index 5cca25797f..94e4f92c92 100644 --- 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 <QtGui/QMouseEvent> -#include <QtGui/QKeyEvent> -#include <QtGui/QImage> -#include <QtCore/QUrl> -#include <QtCore/QEvent> -#include <QtCore/QAbstractAnimation> +#include <qdeclarativelist.h> +#include <qdeclarative.h> + +#include <QMouseEvent> +#include <QKeyEvent> +#include <QImage> +#include <QUrl> +#include <QEvent> +#include <QAbstractAnimation> QT_BEGIN_NAMESPACE diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp index f2e90a1da4..e63213d4dc 100644 --- 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 <QtDeclarative/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 <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 <QNetworkReply> +#include <QNetworkCookieJar> +#include <QNetworkDiskCache> +#include <QNetworkAccessManager> +#include <QNetworkProxyFactory> + +#include <QDeclarativeComponent> + +#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 <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" diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.h b/share/qtcreator/qml/qmlobserver/qmlruntime.h index 047529b36f..9714ed51d1 100644 --- 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" diff --git a/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h b/share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h index d3611bc880..501bcab7f7 100644 --- 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 diff --git a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp index ae77123ff2..8d96da1203 100644 --- 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 diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp index bc35bad47f..c50e211468 100644 --- 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> |