diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-02 23:24:08 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-02 23:24:08 (GMT) |
| commit | 11baee94956f23ff76757040ab10fb3d632d5b42 (patch) | |
| tree | 3cb9582c5f0f33c64df118e1fadbfcde50c0d8c6 /src | |
| parent | 5247ee562f76a51b8a81735d7da709d1b9b63796 (diff) | |
| download | Qt-11baee94956f23ff76757040ab10fb3d632d5b42.zip Qt-11baee94956f23ff76757040ab10fb3d632d5b42.tar.gz Qt-11baee94956f23ff76757040ab10fb3d632d5b42.tar.bz2 | |
Undo most of 913dd563064e8047fe738fc9c79135adfb928977
It seems we're going to have to so a syncqt/configure in Qt modules.
Diffstat (limited to 'src')
197 files changed, 523 insertions, 523 deletions
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp index cfd4cff..244c34a 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.cpp +++ b/src/declarative/3rdparty/qlistmodelinterface.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qlistmodelinterface_p.h" +#include <private/qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp index 40995e7..6c6037e 100644 --- a/src/declarative/debugger/qmldebug.cpp +++ b/src/declarative/debugger/qmldebug.cpp @@ -38,10 +38,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qmldebug_p.h" -#include "qmldebugclient_p.h" +#include <private/qmldebug_p.h> +#include <private/qmldebugclient_p.h> #include <private/qobject_p.h> -#include "qmlenginedebug_p.h" +#include <private/qmlenginedebug_p.h> class QmlEngineDebugClient : public QmlDebugClient { diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp index 3a76b36..f1473c2 100644 --- a/src/declarative/debugger/qmldebugclient.cpp +++ b/src/declarative/debugger/qmldebugclient.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmldebugclient_p.h" +#include <private/qmldebugclient_p.h> #include <private/qobject_p.h> -#include "qpacketprotocol_p.h" +#include <private/qpacketprotocol_p.h> #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> diff --git a/src/declarative/debugger/qmldebuggerstatus.cpp b/src/declarative/debugger/qmldebuggerstatus.cpp index dc1cfb0..208c7a1 100644 --- a/src/declarative/debugger/qmldebuggerstatus.cpp +++ b/src/declarative/debugger/qmldebuggerstatus.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmldebuggerstatus_p.h" +#include <private/qmldebuggerstatus_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp index 3c09585..adf592f 100644 --- a/src/declarative/debugger/qmldebugservice.cpp +++ b/src/declarative/debugger/qmldebugservice.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qmldebugservice_p.h" +#include <private/qmldebugservice_p.h> #include <QtCore/qdebug.h> #include <QtNetwork/qtcpserver.h> #include <QtNetwork/qtcpsocket.h> #include <private/qobject_p.h> -#include "qpacketprotocol_p.h" +#include <private/qpacketprotocol_p.h> #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 6698472..60b8303 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qpacketprotocol_p.h" +#include <private/qpacketprotocol_p.h> #include <QBuffer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 8d059bf..8cadc53 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -14,7 +14,7 @@ exists("qml_enable_gcov") { LIBS += -lgcov } -INCLUDEPATH += 3rdparty util graphicsitems debugger qml +#INCLUDEPATH += 3rdparty util graphicsitems debugger qml include(../qbase.pri) diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp index 8642476..eabd344 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlgraphicsanchors_p_p.h" +#include <private/qmlgraphicsanchors_p_p.h> #include "qmlgraphicsitem.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include <QDebug> #include <qmlinfo.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h index 2156565..5b6d6cf 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlgraphicsanchors_p.h" +#include <private/qmlgraphicsanchors_p.h> #include "private/qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp index f389295..8cb597d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp @@ -41,8 +41,8 @@ #include <QMovie> #include <qmlengine.h> -#include "qmlgraphicsanimatedimage_p.h" -#include "qmlgraphicsanimatedimage_p_p.h" +#include <private/qmlgraphicsanimatedimage_p.h> +#include <private/qmlgraphicsanimatedimage_p_p.h> #include <QNetworkRequest> #include <QNetworkReply> diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h index a837702..79daa0f 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSANIMATEDIMAGE_H #define QMLGRAPHICSANIMATEDIMAGE_H -#include "qmlgraphicsimage_p.h" +#include <private/qmlgraphicsimage_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h index 0d1c749..c24afa0 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlgraphicsimage_p_p.h" +#include <private/qmlgraphicsimage_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index d7d725b..71233c6 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsborderimage_p.h" -#include "qmlgraphicsborderimage_p_p.h" +#include <private/qmlgraphicsborderimage_p.h> +#include <private/qmlgraphicsborderimage_p_p.h> #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h index 18195e2..8c10a87 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h @@ -43,7 +43,7 @@ #define QMLGRAPHICSBORDERIMAGE_H #include <QtNetwork/qnetworkreply.h> -#include "qmlgraphicsimagebase_p.h" +#include <private/qmlgraphicsimagebase_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h index 51ebb02..50d81cd 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmlgraphicsimagebase_p_p.h" -#include "qmlgraphicsscalegrid_p_p.h" +#include <private/qmlgraphicsimagebase_p_p.h> +#include <private/qmlgraphicsscalegrid_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp index 9958dea..24214ea 100644 --- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlgraphicsevents_p_p.h" +#include <private/qmlgraphicsevents_p_p.h> QT_BEGIN_NAMESPACE /*! diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index d827cda..806b72f 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsflickable_p.h" -#include "qmlgraphicsflickable_p_p.h" +#include <private/qmlgraphicsflickable_p.h> +#include <private/qmlgraphicsflickable_p_p.h> #include <QGraphicsSceneMouseEvent> #include <QPointer> diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h index 104769d..4953aa0 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h @@ -54,11 +54,11 @@ // #include "qdatetime.h" -#include "qmlgraphicsflickable_p.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsflickable_p.h> +#include <private/qmlgraphicsitem_p.h> #include "qml.h" -#include "qmltimeline_p_p.h" -#include "qmlanimation_p_p.h" +#include <private/qmltimeline_p_p.h> +#include <private/qmlanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index c271010..cbb5581 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsflipable_p.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsflipable_p.h> +#include <private/qmlgraphicsitem_p.h> #include "QtGui/qgraphicstransform.h" #include <qmlinfo.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp index ae7ffda..8cd59f4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlgraphicsfocuspanel_p.h" +#include <private/qmlgraphicsfocuspanel_p.h> #include <QtGui/qgraphicsscene.h> #include <QEvent> diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp index b0ad32f..f1ddac0 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlgraphicsfocusscope_p.h" +#include <private/qmlgraphicsfocusscope_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp index bdad6ae..2ae18f9 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicsgraphicsobjectcontainer_p.h" +#include <private/qmlgraphicsgraphicsobjectcontainer_p.h> #include <QGraphicsObject> #include <QGraphicsWidget> #include <QGraphicsSceneResizeEvent> -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index cb6e675..f31e586 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicsgridview_p.h" -#include "qmlgraphicsvisualitemmodel_p.h" -#include "qlistmodelinterface_p.h" -#include "qmleasefollow_p.h" -#include "qmlgraphicsflickable_p_p.h" +#include <private/qmlgraphicsgridview_p.h> +#include <private/qmlgraphicsvisualitemmodel_p.h> +#include <private/qlistmodelinterface_p.h> +#include <private/qmleasefollow_p.h> +#include <private/qmlgraphicsflickable_p_p.h> #include <QKeyEvent> diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h index 1615469..99515a3 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRIDVIEW_H #define QMLGRAPHICSGRIDVIEW_H -#include "qmlgraphicsflickable_p.h" +#include <private/qmlgraphicsflickable_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp index 38df0c7..c75b9ce 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsimage_p.h" -#include "qmlgraphicsimage_p_p.h" +#include <private/qmlgraphicsimage_p.h> +#include <private/qmlgraphicsimage_p_p.h> #include <QKeyEvent> #include <QPainter> diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p.h index 47cdcd6..5d1228d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimage_p.h @@ -43,7 +43,7 @@ #define QMLGRAPHICSIMAGE_H #include <QtNetwork/qnetworkreply.h> -#include "qmlgraphicsimagebase_p.h" +#include <private/qmlgraphicsimagebase_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h index f6b4e51..93bccb6 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" -#include "qmlgraphicsimagebase_p_p.h" +#include <private/qmlgraphicsitem_p.h> +#include <private/qmlgraphicsimagebase_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index c6954fb..e11e6c1 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qmlgraphicsimagebase_p.h" -#include "qmlgraphicsimagebase_p_p.h" +#include <private/qmlgraphicsimagebase_p.h> +#include <private/qmlgraphicsimagebase_p_p.h> #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> #include <qmlengine.h> -#include "qmlpixmapcache_p.h" +#include <private/qmlpixmapcache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h index e7f85a6..7ce413c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include <QtCore/QPointer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index 3ca9fce..d02ab1c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -47,21 +47,21 @@ #include <QNetworkRequest> #include <QGraphicsSceneMouseEvent> #include <QtScript/qscriptengine.h> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QtGui/qgraphicstransform.h> #include <QtGui/qgraphicseffect.h> #include <qmlengine.h> -#include "qmlopenmetaobject_p.h" -#include "qmlstate_p.h" -#include "qlistmodelinterface_p.h" +#include <private/qmlopenmetaobject_p.h> +#include <private/qmlstate_p.h> +#include <private/qlistmodelinterface_p.h> #include "qmlview.h" -#include "qmlstategroup_p.h" +#include <private/qmlstategroup_p.h> -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include "qmlgraphicsitem.h" -#include "qmlgraphicsevents_p_p.h" +#include <private/qmlgraphicsevents_p_p.h> #include <qmlcomponent.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index 0c6960e..0c722ac 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -54,10 +54,10 @@ // #include <qmlgraphicsitem.h> -#include "qmlstate_p.h" -#include "qmlgraphicsanchors_p.h" -#include "qmlnullablevalue_p_p.h" -#include "qmlgraphicsanchors_p_p.h" +#include <private/qmlstate_p.h> +#include <private/qmlgraphicsanchors_p.h> +#include <private/qmlnullablevalue_p_p.h> +#include <private/qmlgraphicsanchors_p_p.h> #include <qml.h> #include <qmlcontext.h> #include <QtCore/qlist.h> diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp index fafef0e..fa761a2 100644 --- a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlgraphicslayoutitem_p.h" +#include <private/qmlgraphicslayoutitem_p.h> #include <QDebug> #include <limits.h> diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 83fdf68..d04b4db 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicsflickable_p_p.h" -#include "qmleasefollow_p.h" -#include "qlistmodelinterface_p.h" -#include "qmlgraphicsvisualitemmodel_p.h" -#include "qmlgraphicslistview_p.h" +#include <private/qmlgraphicsflickable_p_p.h> +#include <private/qmleasefollow_p.h> +#include <private/qlistmodelinterface_p.h> +#include <private/qmlgraphicsvisualitemmodel_p.h> +#include <private/qmlgraphicslistview_p.h> #include <qmlexpression.h> #include <QKeyEvent> diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h index 6dc131c..241fb05 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSLISTVIEW_H #define QMLGRAPHICSLISTVIEW_H -#include "qmlgraphicsflickable_p.h" +#include <private/qmlgraphicsflickable_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp index 7b2c542..7c3a8f1 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsloader_p_p.h" -#include "qmlengine_p.h" +#include <private/qmlgraphicsloader_p_p.h> +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h index cd7316d..7c1d9bc 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" -#include "qmlgraphicsloader_p.h" +#include <private/qmlgraphicsitem_p.h> +#include <private/qmlgraphicsloader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp index ec613af..6c594cf 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlgraphicsmouseregion_p.h" -#include "qmlgraphicsmouseregion_p_p.h" -#include "qmlgraphicsevents_p_p.h" +#include <private/qmlgraphicsmouseregion_p.h> +#include <private/qmlgraphicsmouseregion_p_p.h> +#include <private/qmlgraphicsevents_p_p.h> #include <QGraphicsSceneMouseEvent> diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h index ad7cc9f..f1fcd85 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h @@ -56,7 +56,7 @@ #include "qdatetime.h" #include "qbasictimer.h" #include "qgraphicssceneevent.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp index b4bb361..aec5d6b 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicspainteditem_p.h" -#include "qmlgraphicspainteditem_p_p.h" +#include <private/qmlgraphicspainteditem_p.h> +#include <private/qmlgraphicspainteditem_p_p.h> #include <QDebug> #include <QPen> diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h index 6bcc51a..2eace4c 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp index a1dbe14..6286dd3 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include <stdlib.h> #include <math.h> @@ -50,12 +50,12 @@ #ifndef INT_MAX #define INT_MAX 2147483647 #endif -#include "qmlpixmapcache_p.h" -#include "qfxperf_p_p.h" -#include "qmlanimation_p_p.h" +#include <private/qmlpixmapcache_p.h> +#include <private/qfxperf_p_p.h> +#include <private/qmlanimation_p_p.h> #include <QNetworkReply> -#include "qmlgraphicsparticles_p.h" +#include <private/qmlgraphicsparticles_p.h> #include <QPainter> #include <QtGui/qdrawutil.h> #include <QVarLengthArray> diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp index 269552a..2fa965a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlgraphicspath_p.h" -#include "qmlgraphicspath_p_p.h" -#include "qfxperf_p_p.h" +#include <private/qmlgraphicspath_p.h> +#include <private/qmlgraphicspath_p_p.h> +#include <private/qfxperf_p_p.h> #include <private/qbezier_p.h> #include <QSet> diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h index 8c4c962..1374ede 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h @@ -54,7 +54,7 @@ // #include "private/qobject_p.h" -#include "qmlgraphicspath_p.h" +#include <private/qmlgraphicspath_p.h> #include "qml.h" diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp index 3a77274..92751a0 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp @@ -42,12 +42,12 @@ #include <math.h> #include <QDebug> #include <QEvent> -#include "qmlstate_p.h" -#include "qlistmodelinterface_p.h" -#include "qmlopenmetaobject_p.h" +#include <private/qmlstate_p.h> +#include <private/qlistmodelinterface_p.h> +#include <private/qmlopenmetaobject_p.h> -#include "qmlgraphicspathview_p.h" -#include "qmlgraphicspathview_p_p.h" +#include <private/qmlgraphicspathview_p.h> +#include <private/qmlgraphicspathview_p_p.h> #include <QGraphicsSceneEvent> static const int FlickThreshold = 5; diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h index fef0798..38f1cd8 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h @@ -43,7 +43,7 @@ #define QMLGRAPHICSPATHVIEW_H #include <qmlgraphicsitem.h> -#include "qmlgraphicspath_p.h" +#include <private/qmlgraphicspath_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h index a61968c..4987b9c 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h @@ -54,11 +54,11 @@ // #include "qdatetime.h" -#include "qmlgraphicspathview_p.h" -#include "qmlgraphicsitem_p.h" -#include "qmlgraphicsvisualitemmodel_p.h" +#include <private/qmlgraphicspathview_p.h> +#include <private/qmlgraphicsitem_p.h> +#include <private/qmlgraphicsvisualitemmodel_p.h> #include "qml.h" -#include "qmlanimation_p_p.h" +#include <private/qmlanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp index 56fd98e..65e63eb 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp @@ -42,12 +42,12 @@ #include <QDebug> #include <QCoreApplication> #include "qml.h" -#include "qmlstate_p.h" -#include "qmlstategroup_p.h" -#include "qmlstateoperations_p.h" -#include "qfxperf_p_p.h" -#include "qmlgraphicspositioners_p.h" -#include "qmlgraphicspositioners_p_p.h" +#include <private/qmlstate_p.h> +#include <private/qmlstategroup_p.h> +#include <private/qmlstateoperations_p.h> +#include <private/qfxperf_p_p.h> +#include <private/qmlgraphicspositioners_p.h> +#include <private/qmlgraphicspositioners_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h index 001ad80..a0665ae 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -45,7 +45,7 @@ #include <QtCore/QObject> #include <QtCore/QString> #include <qmlgraphicsitem.h> -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h index ced545e..d7a31a3 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include <QtCore/QObject> #include <QtCore/QString> -#include "qmlgraphicspositioners_p.h" -#include "qmlstate_p.h" -#include "qmltransitionmanager_p_p.h" -#include "qmlstateoperations_p.h" +#include <private/qmlgraphicspositioners_p.h> +#include <private/qmlstate_p.h> +#include <private/qmltransitionmanager_p_p.h> +#include <private/qmlstateoperations_p.h> #include <QtCore/QTimer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp index cc09436..9c11bc4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicsrectangle_p.h" -#include "qmlgraphicsrectangle_p_p.h" +#include <private/qmlgraphicsrectangle_p.h> +#include <private/qmlgraphicsrectangle_p_p.h> #include <QPainter> #include <QtCore/qmath.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h index c4bbbe4..d15b2da 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp index 967a29b..4e6fce2 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicsrepeater_p.h" -#include "qmlgraphicsrepeater_p_p.h" -#include "qmllistaccessor_p.h" -#include "qmlgraphicsvisualitemmodel_p.h" -#include "qlistmodelinterface_p.h" +#include <private/qmlgraphicsrepeater_p.h> +#include <private/qmlgraphicsrepeater_p_p.h> +#include <private/qmllistaccessor_p.h> +#include <private/qmlgraphicsvisualitemmodel_p.h> +#include <private/qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h index 4af0d9e..c2a8606 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmlgraphicsitem_p.h" -#include "qmlgraphicsrepeater_p.h" +#include <private/qmlgraphicsitem_p.h> +#include <private/qmlgraphicsrepeater_p.h> #include <QPointer> diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp index 7517a3c..142384b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp @@ -42,7 +42,7 @@ #include <QBuffer> #include <qml.h> #include <QDebug> -#include "qmlgraphicsscalegrid_p_p.h" +#include <private/qmlgraphicsscalegrid_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index 4283c19..6a2b773 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -44,9 +44,9 @@ #include <QtCore/QString> #include <QtCore/QObject> -#include "qmlpixmapcache_p.h" +#include <private/qmlpixmapcache_p.h> #include <qml.h> -#include "qmlgraphicsborderimage_p.h" +#include <private/qmlgraphicsborderimage_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp index 2d2c523..c34fbd8 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicstext_p.h" -#include "qmlgraphicstext_p_p.h" +#include <private/qmlgraphicstext_p.h> +#include <private/qmlgraphicstext_p_p.h> #include <private/qtextcontrol_p.h> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QTextLayout> #include <QTextLine> #include <QTextDocument> diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h index 4ca1ad4..7017a86 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h @@ -54,7 +54,7 @@ // #include "qmlgraphicsitem.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsitem_p.h> #include "qml.h" #include <QtGui/qtextlayout.h> diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 4fed035..042c43c 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmlgraphicstextedit_p.h" -#include "qmlgraphicstextedit_p_p.h" +#include <private/qmlgraphicstextedit_p.h> +#include <private/qmlgraphicstextedit_p_p.h> #include <private/qtextcontrol_p.h> -#include "qfxperf_p_p.h" -#include "qmlgraphicsevents_p_p.h" +#include <private/qfxperf_p_p.h> +#include <private/qmlgraphicsevents_p_p.h> #include <QTextLayout> #include <QTextLine> #include <QTextDocument> diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h index 28d7d83..1ddfa6b 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h @@ -42,8 +42,8 @@ #ifndef QMLGRAPHICSTEXTEDIT_H #define QMLGRAPHICSTEXTEDIT_H -#include "qmlgraphicstext_p.h" -#include "qmlgraphicspainteditem_p.h" +#include <private/qmlgraphicstext_p.h> +#include <private/qmlgraphicspainteditem_p.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h index 6541921..84965e4 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h @@ -54,7 +54,7 @@ // #include "qmlgraphicsitem.h" -#include "qmlgraphicspainteditem_p_p.h" +#include <private/qmlgraphicspainteditem_p_p.h> #include "qml.h" diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp index b7d4e8c..d3e8ad6 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlgraphicstextinput_p.h" -#include "qmlgraphicstextinput_p_p.h" +#include <private/qmlgraphicstextinput_p.h> +#include <private/qmlgraphicstextinput_p_p.h> #include "qmlinfo.h" #include <QValidator> #include <QApplication> diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h index 87ceccf..a31ced2 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h @@ -42,8 +42,8 @@ #ifndef QMLGRAPHICSTEXTINPUT_H #define QMLGRAPHICSTEXTINPUT_H -#include "qmlgraphicstext_p.h" -#include "qmlgraphicspainteditem_p.h" +#include <private/qmlgraphicstext_p.h> +#include <private/qmlgraphicspainteditem_p.h> #include <QGraphicsSceneMouseEvent> #include <QIntValidator> diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h index 4e9f209..efb05fe 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h @@ -42,9 +42,9 @@ #ifndef QMLGRAPHICSTEXTINPUT_P_H #define QMLGRAPHICSTEXTINPUT_P_H -#include "qmlgraphicstextinput_p.h" +#include <private/qmlgraphicstextinput_p.h> #include "qml.h" -#include "qmlgraphicspainteditem_p_p.h" +#include <private/qmlgraphicspainteditem_p_p.h> #include "private/qlinecontrol_p.h" #include <QPointer> // diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp index cde1f8a..eaf25d1 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp @@ -39,19 +39,19 @@ ** ****************************************************************************/ -#include "qlistmodelinterface_p.h" +#include <private/qlistmodelinterface_p.h> #include "qmlgraphicsitem.h" #include <qmlcontext.h> #include <qmlexpression.h> -#include "qmlpackage_p.h" +#include <private/qmlpackage_p.h> #include "qhash.h" #include "qlist.h" #include "private/qobject_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qmlopenmetaobject_p.h" -#include "qmllistaccessor_p.h" +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmlopenmetaobject_p.h> +#include <private/qmllistaccessor_p.h> #include "qmlinfo.h" -#include "qmlgraphicsvisualitemmodel_p.h" +#include <private/qmlgraphicsvisualitemmodel_p.h> #include "private/qguard_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index 35dd1f0..ffbbdf9 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -55,12 +55,12 @@ #include "qml.h" #include "qmlengine.h" -#include "qmlstate_p.h" -#include "qlistmodelinterface_p.h" +#include <private/qmlstate_p.h> +#include <private/qlistmodelinterface_p.h> -#include "qmlgraphicswebview_p.h" -#include "qmlgraphicswebview_p_p.h" -#include "qmlgraphicspainteditem_p_p.h" +#include <private/qmlgraphicswebview_p.h> +#include <private/qmlgraphicswebview_p_p.h> +#include <private/qmlgraphicspainteditem_p_p.h> QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView) diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 2280697..a1c0d57 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -44,7 +44,7 @@ #include <QtGui/QAction> #include <QtCore/QUrl> -#include "qmlgraphicspainteditem_p.h" +#include <private/qmlgraphicspainteditem_p.h> #include <QtNetwork/qnetworkaccessmanager.h> #include <QtWebKit/QWebPage> diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index 6986bd2..81b0649 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmljsast_p.h" -#include "qmljsastvisitor_p.h" +#include <private/qmljsast_p.h> +#include <private/qmljsastvisitor_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index 388bc12..d3ba0e4 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmljsastvisitor_p.h" -#include "qmljsglobal_p.h" +#include <private/qmljsastvisitor_p.h> +#include <private/qmljsglobal_p.h> #include <QtCore/QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h index b558a23..b485138 100644 --- a/src/declarative/qml/parser/qmljsastfwd_p.h +++ b/src/declarative/qml/parser/qmljsastfwd_p.h @@ -43,7 +43,7 @@ #define QMLJSAST_FWD_P_H #include <QtCore/qglobal.h> -#include "qmljsglobal_p.h" +#include <private/qmljsglobal_p.h> // // W A R N I N G diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp index 1290c89..089fe76 100644 --- a/src/declarative/qml/parser/qmljsastvisitor.cpp +++ b/src/declarative/qml/parser/qmljsastvisitor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmljsastvisitor_p.h" +#include <private/qmljsastvisitor_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h index 7db84b0..cb76b3a 100644 --- a/src/declarative/qml/parser/qmljsastvisitor_p.h +++ b/src/declarative/qml/parser/qmljsastvisitor_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qmljsastfwd_p.h" -#include "qmljsglobal_p.h" +#include <private/qmljsastfwd_p.h> +#include <private/qmljsglobal_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp index cee90a3..ab317aa 100644 --- a/src/declarative/qml/parser/qmljsengine_p.cpp +++ b/src/declarative/qml/parser/qmljsengine_p.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmljsglobal_p.h" -#include "qmljsengine_p.h" -#include "qmljsnodepool_p.h" +#include <private/qmljsglobal_p.h> +#include <private/qmljsengine_p.h> +#include <private/qmljsnodepool_p.h> #include <qnumeric.h> #include <QHash> diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h index a60c515..2fd0421 100644 --- a/src/declarative/qml/parser/qmljsengine_p.h +++ b/src/declarative/qml/parser/qmljsengine_p.h @@ -56,8 +56,8 @@ #include <QString> #include <QSet> -#include "qmljsglobal_p.h" -#include "qmljsastfwd_p.h" +#include <private/qmljsglobal_p.h> +#include <private/qmljsastfwd_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index b8c6560..9ad61e6 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -40,7 +40,7 @@ ** ****************************************************************************/ -#include "qmljsgrammar_p.h" +#include <private/qmljsgrammar_p.h> const char *const QmlJSGrammar::spell [] = { "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp index d316f93..2edd553 100644 --- a/src/declarative/qml/parser/qmljslexer.cpp +++ b/src/declarative/qml/parser/qmljslexer.cpp @@ -43,10 +43,10 @@ #include "config.h" #endif -#include "qmljsglobal_p.h" -#include "qmljsengine_p.h" -#include "qmljslexer_p.h" -#include "qmljsgrammar_p.h" +#include <private/qmljsglobal_p.h> +#include <private/qmljsengine_p.h> +#include <private/qmljslexer_p.h> +#include <private/qmljsgrammar_p.h> #include <QtGui/qapplication.h> diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h index f499750..96c8921 100644 --- a/src/declarative/qml/parser/qmljslexer_p.h +++ b/src/declarative/qml/parser/qmljslexer_p.h @@ -55,7 +55,7 @@ #include <QtCore/QString> -#include "qmljsglobal_p.h" +#include <private/qmljsglobal_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h index 24a2145..ca60ef1 100644 --- a/src/declarative/qml/parser/qmljsmemorypool_p.h +++ b/src/declarative/qml/parser/qmljsmemorypool_p.h @@ -57,7 +57,7 @@ #include <QtCore/qshareddata.h> #include <string.h> -#include "qmljsglobal_p.h" +#include <private/qmljsglobal_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h index ca4d729..573a947 100644 --- a/src/declarative/qml/parser/qmljsnodepool_p.h +++ b/src/declarative/qml/parser/qmljsnodepool_p.h @@ -56,8 +56,8 @@ #include <QtCore/QHash> #include <QtCore/QString> -#include "qmljsglobal_p.h" -#include "qmljsmemorypool_p.h" +#include <private/qmljsglobal_p.h> +#include <private/qmljsmemorypool_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 453503b..472f67e 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -46,14 +46,14 @@ #include <string.h> -#include "qmljsengine_p.h" -#include "qmljslexer_p.h" -#include "qmljsast_p.h" -#include "qmljsnodepool_p.h" +#include <private/qmljsengine_p.h> +#include <private/qmljslexer_p.h> +#include <private/qmljsast_p.h> +#include <private/qmljsnodepool_p.h> -#include "qmljsparser_p.h" +#include <private/qmljsparser_p.h> #include <QVarLengthArray> // diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 7fad58a..aab6c7e 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -60,10 +60,10 @@ #ifndef QMLJSPARSER_P_H #define QMLJSPARSER_P_H -#include "qmljsglobal_p.h" -#include "qmljsgrammar_p.h" -#include "qmljsast_p.h" -#include "qmljsengine_p.h" +#include <private/qmljsglobal_p.h> +#include <private/qmljsgrammar_p.h> +#include <private/qmljsast_p.h> +#include <private/qmljsengine_p.h> #include <QtCore/QList> #include <QtCore/QString> diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index c421c76..3187e41 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmetaobjectbuilder_p.h" +#include <private/qmetaobjectbuilder_p.h> #ifndef Q_OS_WIN #include <stdint.h> #endif diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index a27c4fb..01cb97f 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "qmlbasicscript_p.h" +#include <private/qmlbasicscript_p.h> #include <QColor> #include <QDebug> -#include "qmlengine_p.h" -#include "qmlcontext_p.h" +#include <private/qmlengine_p.h> +#include <private/qmlcontext_p.h> #include <QStack> -#include "qfxperf_p_p.h" -#include "qmlrefcount_p.h" -#include "qmljsast_p.h" -#include "qmljsengine_p.h" -#include "qmlglobal_p.h" +#include <private/qfxperf_p_p.h> +#include <private/qmlrefcount_p.h> +#include <private/qmljsast_p.h> +#include <private/qmljsengine_p.h> +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h index 4c4b178..57d4fa7 100644 --- a/src/declarative/qml/qmlbasicscript_p.h +++ b/src/declarative/qml/qmlbasicscript_p.h @@ -56,7 +56,7 @@ #include <QtCore/QList> #include <QtCore/QByteArray> #include <QtCore/QVariant> -#include "qmlparser_p.h" +#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index bb9a803..f0bfd98 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -41,15 +41,15 @@ #include <qml.h> #include "qmlbinding.h" -#include "qmlbinding_p.h" +#include <private/qmlbinding_p.h> #include <qmlcontext.h> #include <qmlinfo.h> #include <QVariant> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QtCore/qdebug.h> -#include "qmlcontext_p.h" -#include "qmldeclarativedata_p.h" -#include "qmlstringconverters_p.h" +#include <private/qmlcontext_p.h> +#include <private/qmldeclarativedata_p.h> +#include <private/qmlstringconverters_p.h> Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h index 30a31ab..85d9ad6 100644 --- a/src/declarative/qml/qmlbinding_p.h +++ b/src/declarative/qml/qmlbinding_p.h @@ -55,7 +55,7 @@ #include <qmlbinding.h> #include <qmlmetaproperty.h> -#include "qmlexpression_p.h" +#include <private/qmlexpression_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp index 5c67241..136bf23 100644 --- a/src/declarative/qml/qmlbindingoptimizations.cpp +++ b/src/declarative/qml/qmlbindingoptimizations.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlbindingoptimizations_p.h" -#include "qmlcontext_p.h" +#include <private/qmlbindingoptimizations_p.h> +#include <private/qmlcontext_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h index 1e3723f..2cdc07d 100644 --- a/src/declarative/qml/qmlbindingoptimizations_p.h +++ b/src/declarative/qml/qmlbindingoptimizations_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlexpression_p.h" +#include <private/qmlexpression_p.h> #include <qmlbinding.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index 78bcd49..1f41472 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qmlboundsignal_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qmlengine_p.h" -#include "qmlexpression_p.h" -#include "qmlcontext_p.h" +#include <private/qmlboundsignal_p.h> +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmlengine_p.h> +#include <private/qmlexpression_p.h> +#include <private/qmlcontext_p.h> #include <qmlmetatype.h> #include <qml.h> #include <qmlcontext.h> #include <QtCore/qdebug.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlclassfactory.cpp b/src/declarative/qml/qmlclassfactory.cpp index 3c19c2f..bad0890 100644 --- a/src/declarative/qml/qmlclassfactory.cpp +++ b/src/declarative/qml/qmlclassfactory.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlclassfactory_p.h" +#include <private/qmlclassfactory_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp index 6b98191..0a0175c 100644 --- a/src/declarative/qml/qmlcleanup.cpp +++ b/src/declarative/qml/qmlcleanup.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlcleanup_p.h" -#include "qmlengine_p.h" +#include <private/qmlcleanup_p.h> +#include <private/qmlengine_p.h> /*! \internal diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp index 9b931c5..c4a0b59 100644 --- a/src/declarative/qml/qmlcompileddata.cpp +++ b/src/declarative/qml/qmlcompileddata.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qmlcompiler_p.h" +#include <private/qmlcompiler_p.h> #include "qmlengine.h" #include "qmlcomponent.h" -#include "qmlcomponent_p.h" +#include <private/qmlcomponent_p.h> #include "qmlcontext.h" -#include "qmlcontext_p.h" +#include <private/qmlcontext_p.h> #include <private/qobject_p.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 8edf023..7a31673 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -39,40 +39,40 @@ ** ****************************************************************************/ -#include "qmlcompiler_p.h" -#include "qmlcompositetypedata_p.h" -#include "qfxperf_p_p.h" -#include "qmlparser_p.h" -#include "qmlscriptparser_p.h" +#include <private/qmlcompiler_p.h> +#include <private/qmlcompositetypedata_p.h> +#include <private/qfxperf_p_p.h> +#include <private/qmlparser_p.h> +#include <private/qmlscriptparser_p.h> #include <qmlpropertyvaluesource.h> #include <qmlcomponent.h> -#include "qmetaobjectbuilder_p.h" -#include "qmlbasicscript_p.h" +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmlbasicscript_p.h> #include <QColor> #include <QDebug> #include <QPointF> #include <QSizeF> #include <QRectF> #include <QAtomicInt> -#include "qmlstringconverters_p.h" -#include "qmlengine_p.h" +#include <private/qmlstringconverters_p.h> +#include <private/qmlengine_p.h> #include <qmlengine.h> #include <qmlcontext.h> #include <qmlmetatype.h> #include <QtCore/qdebug.h> #include <QtGui/qapplication.h> -#include "qmlcustomparser_p_p.h" -#include "qmlcontext_p.h" -#include "qmlcomponent_p.h" +#include <private/qmlcustomparser_p_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmlcomponent_p.h> #include "parser/qmljsast_p.h" -#include "qmlvmemetaobject_p.h" -#include "qmlexpression_p.h" -#include "qmlmetaproperty_p.h" -#include "qmlrewrite_p.h" +#include <private/qmlvmemetaobject_p.h> +#include <private/qmlexpression_p.h> +#include <private/qmlmetaproperty_p.h> +#include <private/qmlrewrite_p.h> #include <qmlscriptstring.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> -#include "qmlscriptparser_p.h" +#include <private/qmlscriptparser_p.h> QT_BEGIN_NAMESPACE @@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode) return true; } -#include "qmljsparser_p.h" +#include <private/qmljsparser_p.h> static QStringList astNodeToStringList(QmlJS::AST::Node *node) { if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) { diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index 991ae81..542fb48 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -57,14 +57,14 @@ #include <QtCore/qset.h> #include <qml.h> #include <qmlerror.h> -#include "qmlinstruction_p.h" -#include "qmlcompositetypemanager_p.h" -#include "qmlparser_p.h" -#include "qmlengine_p.h" -#include "qbitfield_p.h" -#include "qmlpropertycache_p.h" -#include "qmlintegercache_p.h" -#include "qmltypenamecache_p.h" +#include <private/qmlinstruction_p.h> +#include <private/qmlcompositetypemanager_p.h> +#include <private/qmlparser_p.h> +#include <private/qmlengine_p.h> +#include <private/qbitfield_p.h> +#include <private/qmlpropertycache_p.h> +#include <private/qmlintegercache_p.h> +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 2e8e4ce..1e922b0 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -40,25 +40,25 @@ ****************************************************************************/ #include "qmlcomponent.h" -#include "qmlcomponent_p.h" -#include "qmlcompiler_p.h" -#include "qmlcontext_p.h" -#include "qmlcompositetypedata_p.h" -#include "qmlengine_p.h" -#include "qmlvme_p.h" +#include <private/qmlcomponent_p.h> +#include <private/qmlcompiler_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmlcompositetypedata_p.h> +#include <private/qmlengine_p.h> +#include <private/qmlvme_p.h> #include "qml.h" #include <QStack> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QStringList> #include <qmlengine.h> #include <QFileInfo> #include "qmlbinding.h" #include <QtCore/qdebug.h> #include <QApplication> -#include "qmlbinding_p.h" -#include "qmlglobal_p.h" +#include <private/qmlbinding_p.h> +#include <private/qmlglobal_p.h> -#include "qmlscriptparser_p.h" +#include <private/qmlscriptparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index c9dfac8..61a8a10 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -57,9 +57,9 @@ #include <QtCore/QStringList> #include <QtCore/QList> #include <private/qobject_p.h> -#include "qmlengine_p.h" -#include "qmlcompositetypemanager_p.h" -#include "qbitfield_p.h" +#include <private/qmlengine_p.h> +#include <private/qmlcompositetypemanager_p.h> +#include <private/qbitfield_p.h> #include <qmlerror.h> #include <qmlcomponent.h> #include <qml.h> diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h index 96531982..0d2843d 100644 --- a/src/declarative/qml/qmlcompositetypedata_p.h +++ b/src/declarative/qml/qmlcompositetypedata_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qglobal.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index ca07d84..fa68951 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "qmlcompositetypedata_p.h" -#include "qmlcompositetypemanager_p.h" -#include "qmlscriptparser_p.h" +#include <private/qmlcompositetypedata_p.h> +#include <private/qmlcompositetypemanager_p.h> +#include <private/qmlscriptparser_p.h> #include <qmlengine.h> #include <QtNetwork/qnetworkreply.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <QtCore/qdebug.h> #include <QtCore/qfile.h> #include <qmlcomponent.h> -#include "qmlcomponent_p.h" -#include "qmlcompiler_p.h" +#include <private/qmlcomponent_p.h> +#include <private/qmlcompiler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index f81e594..0abbfb5 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -54,8 +54,8 @@ // #include <QtCore/qglobal.h> -#include "qmlscriptparser_p.h" -#include "qmlrefcount_p.h" +#include <private/qmlscriptparser_p.h> +#include <private/qmlrefcount_p.h> #include <qmlerror.h> #include <qmlengine.h> diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index be483c9..38cbcfa 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include <qmlcontext.h> -#include "qmlcontext_p.h" -#include "qmlexpression_p.h" -#include "qmlengine_p.h" +#include <private/qmlcontext_p.h> +#include <private/qmlexpression_p.h> +#include <private/qmlengine_p.h> #include <qmlengine.h> #include <qscriptengine.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qdebug.h> -#include "qmlbindingoptimizations_p.h" +#include <private/qmlbindingoptimizations_p.h> #include <private/qscriptdeclarativeclass_p.h> #include <qmlinfo.h> diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index 4ad524d..c8d0b2d 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -55,14 +55,14 @@ #include <qmlcontext.h> #include <private/qobject_p.h> -#include "qmldeclarativedata_p.h" +#include <private/qmldeclarativedata_p.h> #include <QtCore/qhash.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qset.h> #include <private/qguard_p.h> -#include "qmlengine_p.h" -#include "qmlintegercache_p.h" -#include "qmltypenamecache_p.h" +#include <private/qmlengine_p.h> +#include <private/qmlintegercache_p.h> +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp index c740ce7..d567da1 100644 --- a/src/declarative/qml/qmlcontextscriptclass.cpp +++ b/src/declarative/qml/qmlcontextscriptclass.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qmlcontextscriptclass_p.h" -#include "qmlengine_p.h" -#include "qmlcontext_p.h" -#include "qmltypenamescriptclass_p.h" +#include <private/qmlcontextscriptclass_p.h> +#include <private/qmlengine_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmltypenamescriptclass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h index d24dfa6..10b848a 100644 --- a/src/declarative/qml/qmlcontextscriptclass_p.h +++ b/src/declarative/qml/qmlcontextscriptclass_p.h @@ -55,7 +55,7 @@ #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmltypenamecache_p.h" +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp index 32a745c..9174fe6 100644 --- a/src/declarative/qml/qmlcustomparser.cpp +++ b/src/declarative/qml/qmlcustomparser.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlcustomparser_p.h" -#include "qmlcustomparser_p_p.h" -#include "qmlparser_p.h" +#include <private/qmlcustomparser_p.h> +#include <private/qmlcustomparser_p_p.h> +#include <private/qmlparser_p.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 9b09280..88a264f 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -57,7 +57,7 @@ #include <QtCore/qxmlstream.h> #include <qmlmetatype.h> #include <qmlerror.h> -#include "qmlparser_p.h" +#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlcustomparser_p_p.h b/src/declarative/qml/qmlcustomparser_p_p.h index 2e0f14a..e8673c9 100644 --- a/src/declarative/qml/qmlcustomparser_p_p.h +++ b/src/declarative/qml/qmlcustomparser_p_p.h @@ -54,8 +54,8 @@ // #include <QtCore/qglobal.h> -#include "qmlcustomparser_p.h" -#include "qmlparser_p.h" +#include <private/qmlcustomparser_p.h> +#include <private/qmlparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 596294f..1b02199 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -40,15 +40,15 @@ ****************************************************************************/ #include "qmldom.h" -#include "qmldom_p.h" -#include "qmlcompositetypedata_p.h" -#include "qmlcompiler_p.h" -#include "qmlengine_p.h" +#include <private/qmldom_p.h> +#include <private/qmlcompositetypedata_p.h> +#include <private/qmlcompiler_p.h> +#include <private/qmlengine_p.h> #include <QtCore/QByteArray> #include <QtCore/QDebug> #include <QtCore/QString> -#include "qmlscriptparser_p.h" -#include "qmlglobal_p.h" +#include <private/qmlscriptparser_p.h> +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h index cb0d884..10bf312 100644 --- a/src/declarative/qml/qmldom_p.h +++ b/src/declarative/qml/qmldom_p.h @@ -54,7 +54,7 @@ // #include <QtCore/QtGlobal> -#include "qmlparser_p.h" +#include <private/qmlparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index f136017..06743cc 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include <QtCore/qmetaobject.h> -#include "qmlengine_p.h" -#include "qmlcontext_p.h" +#include <private/qmlengine_p.h> +#include <private/qmlcontext_p.h> #include <private/qobject_p.h> -#include "qmlcompiler_p.h" +#include <private/qmlcompiler_p.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlglobalscriptclass_p.h" +#include <private/qmlglobalscriptclass_p.h> #include <QScriptClass> #include <QNetworkReply> @@ -58,9 +58,9 @@ #include <QDebug> #include <QMetaObject> #include "qml.h" -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QStack> -#include "qmlbasicscript_p.h" +#include <private/qmlbasicscript_p.h> #include "qmlengine.h" #include "qmlcontext.h" #include "qmlexpression.h" @@ -73,19 +73,19 @@ #include <QtGui/qsound.h> #include <QGraphicsObject> #include <qmlcomponent.h> -#include "qmlmetaproperty_p.h" -#include "qmlbinding_p.h" -#include "qmlvme_p.h" -#include "qmlenginedebug_p.h" -#include "qmlstringconverters_p.h" -#include "qmlxmlhttprequest_p.h" -#include "qmlsqldatabase_p.h" -#include "qmltypenamescriptclass_p.h" -#include "qmllistscriptclass_p.h" +#include <private/qmlmetaproperty_p.h> +#include <private/qmlbinding_p.h> +#include <private/qmlvme_p.h> +#include <private/qmlenginedebug_p.h> +#include <private/qmlstringconverters_p.h> +#include <private/qmlxmlhttprequest_p.h> +#include <private/qmlsqldatabase_p.h> +#include <private/qmltypenamescriptclass_p.h> +#include <private/qmllistscriptclass_p.h> #include <qmlscriptstring.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> #include <QtCore/qcryptographichash.h> -#include "qmlworkerscript_p.h" +#include <private/qmlworkerscript_p.h> #ifdef Q_OS_WIN // for %APPDATA% #include "qt_windows.h" @@ -1211,7 +1211,7 @@ QmlEnginePrivate::Imports::~Imports() } #include <qmlmetatype.h> -#include "qmltypenamecache_p.h" +#include <private/qmltypenamecache_p.h> static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache) { if (!cache) diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 9267a66..4eb9843 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -61,21 +61,21 @@ #include <QtCore/qpair.h> #include <QtCore/qstack.h> #include <private/qobject_p.h> -#include "qmlclassfactory_p.h" -#include "qmlcompositetypemanager_p.h" -#include "qpodvector_p.h" +#include <private/qmlclassfactory_p.h> +#include <private/qmlcompositetypemanager_p.h> +#include <private/qpodvector_p.h> #include <qml.h> -#include "qmlbasicscript_p.h" -#include "qmlvaluetype_p.h" +#include <private/qmlbasicscript_p.h> +#include <private/qmlvaluetype_p.h> #include <qmlcontext.h> #include <qmlengine.h> #include <qmlexpression.h> #include <QtScript/qscriptengine.h> -#include "qmlmetaproperty_p.h" -#include "qmlpropertycache_p.h" -#include "qmlobjectscriptclass_p.h" -#include "qmlcontextscriptclass_p.h" -#include "qmlvaluetypescriptclass_p.h" +#include <private/qmlmetaproperty_p.h> +#include <private/qmlpropertycache_p.h> +#include <private/qmlobjectscriptclass_p.h> +#include <private/qmlcontextscriptclass_p.h> +#include <private/qmlvaluetypescriptclass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp index 6871236..68c0607 100644 --- a/src/declarative/qml/qmlenginedebug.cpp +++ b/src/declarative/qml/qmlenginedebug.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qmlenginedebug_p.h" -#include "qmlboundsignal_p.h" +#include <private/qmlenginedebug_p.h> +#include <private/qmlboundsignal_p.h> #include <QtCore/qdebug.h> #include <QtCore/qmetaobject.h> #include <qmlengine.h> #include <qmlmetatype.h> #include <qmlmetaproperty.h> #include <qmlbinding.h> -#include "qmlcontext_p.h" -#include "qmlwatcher_p.h" +#include <private/qmlcontext_p.h> +#include <private/qmlwatcher_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h index 1804f6b..8ba3d38 100644 --- a/src/declarative/qml/qmlenginedebug_p.h +++ b/src/declarative/qml/qmlenginedebug_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmldebugservice_p.h" +#include <private/qmldebugservice_p.h> #include <QtCore/qurl.h> #include <QtCore/qvariant.h> diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 2239d77..d7a6496 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "qmlexpression.h" -#include "qmlexpression_p.h" -#include "qmlengine_p.h" -#include "qmlcontext_p.h" -#include "qmlrewrite_p.h" +#include <private/qmlexpression_p.h> +#include <private/qmlengine_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmlrewrite_p.h> #include "QtCore/qdebug.h" -#include "qmlcompiler_p.h" +#include <private/qmlcompiler_p.h> #include <QtScript/qscriptprogram.h> #include <private/qscriptdeclarativeclass_p.h> diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h index dbb12ba..98ef856 100644 --- a/src/declarative/qml/qmlexpression_p.h +++ b/src/declarative/qml/qmlexpression_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qmlbasicscript_p.h" +#include <private/qmlbasicscript_p.h> #include "qmlexpression.h" -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <private/qguard_p.h> #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/qml/qmlglobalscriptclass.cpp b/src/declarative/qml/qmlglobalscriptclass.cpp index fd270e3..bb81d37 100644 --- a/src/declarative/qml/qmlglobalscriptclass.cpp +++ b/src/declarative/qml/qmlglobalscriptclass.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlglobalscriptclass_p.h" +#include <private/qmlglobalscriptclass_p.h> #include <QtScript/qscriptstring.h> #include <QtScript/qscriptengine.h> #include <QtScript/qscriptvalueiterator.h> diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index 3d9e0f7..bbd6022 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlinfo.h" -#include "qmldeclarativedata_p.h" +#include <private/qmldeclarativedata_p.h> #include <qmlcontext.h> #include <QtGui/qapplication.h> diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp index 65d070c..322ae9c 100644 --- a/src/declarative/qml/qmlinstruction.cpp +++ b/src/declarative/qml/qmlinstruction.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlinstruction_p.h" -#include "qmlcompiler_p.h" +#include <private/qmlinstruction_p.h> +#include <private/qmlcompiler_p.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp index 981e653..673d683 100644 --- a/src/declarative/qml/qmlintegercache.cpp +++ b/src/declarative/qml/qmlintegercache.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlintegercache_p.h" -#include "qmlengine_p.h" +#include <private/qmlintegercache_p.h> +#include <private/qmlengine_p.h> #include <qmlmetatype.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h index 1592337..2b10dcc 100644 --- a/src/declarative/qml/qmlintegercache_p.h +++ b/src/declarative/qml/qmlintegercache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlcleanup_p.h" +#include <private/qmlcleanup_p.h> #include <QtCore/qhash.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp index bb3eb21..6e67864 100644 --- a/src/declarative/qml/qmllistscriptclass.cpp +++ b/src/declarative/qml/qmllistscriptclass.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmllistscriptclass_p.h" -#include "qmlengine_p.h" +#include <private/qmllistscriptclass_p.h> +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 0e34305..5a1c327 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -40,19 +40,19 @@ ****************************************************************************/ #include "qmlmetaproperty.h" -#include "qmlmetaproperty_p.h" -#include "qmlcompositetypedata_p.h" +#include <private/qmlmetaproperty_p.h> +#include <private/qmlcompositetypedata_p.h> #include <qml.h> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <QStringList> #include "qmlbinding.h" #include <qmlcontext.h> -#include "qmlboundsignal_p.h" +#include <private/qmlboundsignal_p.h> #include <math.h> #include <QtCore/qdebug.h> #include <qmlengine.h> -#include "qmlengine_p.h" -#include "qmldeclarativedata_p.h" +#include <private/qmlengine_p.h> +#include <private/qmldeclarativedata_p.h> Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index dfb05fb..d225afa 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -55,7 +55,7 @@ #include "qmlmetaproperty.h" #include <private/qobject_p.h> -#include "qmlpropertycache_p.h" +#include <private/qmlpropertycache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 06927457..46d967b 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -45,7 +45,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qbitarray.h> #include <QtCore/qreadwritelock.h> -#include "qmlproxymetaobject_p.h" +#include <private/qmlproxymetaobject_p.h> #include <qmetatype.h> #include <qobjectdefs.h> @@ -59,7 +59,7 @@ #include <ctype.h> #include <QtCore/qcryptographichash.h> #include <QtScript/qscriptvalue.h> -#include "qmlcustomparser_p.h" +#include <private/qmlcustomparser_p.h> #ifdef QT_BOOTSTRAPPED # ifndef QT_NO_GEOM_VARIANT diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 7c4ce5b..fb3dd07 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qmlobjectscriptclass_p.h" -#include "qmlengine_p.h" +#include <private/qmlobjectscriptclass_p.h> +#include <private/qmlengine_p.h> #include <private/qguard_p.h> -#include "qmlcontext_p.h" -#include "qmldeclarativedata_p.h" -#include "qmltypenamescriptclass_p.h" -#include "qmllistscriptclass_p.h" +#include <private/qmlcontext_p.h> +#include <private/qmldeclarativedata_p.h> +#include <private/qmltypenamescriptclass_p.h> +#include <private/qmllistscriptclass_p.h> #include <qmlbinding.h> #include <QtCore/qtimer.h> diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index 771c3eb..6169812 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -55,8 +55,8 @@ #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlpropertycache_p.h" -#include "qmltypenamecache_p.h" +#include <private/qmlpropertycache_p.h> +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 04e2926..d92529b 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -39,21 +39,21 @@ ** ****************************************************************************/ -#include "qmlparser_p.h" +#include <private/qmlparser_p.h> #include <QStack> #include <qmlpropertyvaluesource.h> #include <QColor> #include <QPointF> #include <QSizeF> #include <QRectF> -#include "qmlvme_p.h" -#include "qfxperf_p_p.h" +#include <private/qmlvme_p.h> +#include <private/qfxperf_p_p.h> #include <qml.h> -#include "qmlcomponent_p.h" +#include <private/qmlcomponent_p.h> #include <qmlcomponent.h> -#include "qmetaobjectbuilder_p.h" -#include "qmlvmemetaobject_p.h" -#include "qmlcompiler_p.h" +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmlvmemetaobject_p.h> +#include <private/qmlcompiler_p.h> #include "parser/qmljsast_p.h" #include "parser/qmljsengine_p.h" #include <QtDebug> diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index d4bf88e..73bb498 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -57,7 +57,7 @@ #include <QtCore/QList> #include <QtCore/qstring.h> #include <qml.h> -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> #include <private/qobject_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp index 0e7da84..89d66b1 100644 --- a/src/declarative/qml/qmlpropertycache.cpp +++ b/src/declarative/qml/qmlpropertycache.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlpropertycache_p.h" -#include "qmlengine_p.h" +#include <private/qmlpropertycache_p.h> +#include <private/qmlengine_p.h> #include <qmlbinding.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h index 9265910..8f19a8b 100644 --- a/src/declarative/qml/qmlpropertycache_p.h +++ b/src/declarative/qml/qmlpropertycache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlcleanup_p.h" +#include <private/qmlcleanup_p.h> #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp index 983c350..72e8504 100644 --- a/src/declarative/qml/qmlproxymetaobject.cpp +++ b/src/declarative/qml/qmlproxymetaobject.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlproxymetaobject_p.h" +#include <private/qmlproxymetaobject_p.h> #include <QDebug> diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h index 7a15bd9..7f9163c 100644 --- a/src/declarative/qml/qmlproxymetaobject_p.h +++ b/src/declarative/qml/qmlproxymetaobject_p.h @@ -55,7 +55,7 @@ #include <QtCore/QMetaObject> #include <QtCore/QObject> -#include "qmetaobjectbuilder_p.h" +#include <private/qmetaobjectbuilder_p.h> #include <private/qobject_p.h> #include <qml.h> diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp index 9422625..dbe84ad 100644 --- a/src/declarative/qml/qmlrefcount.cpp +++ b/src/declarative/qml/qmlrefcount.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp index 5fcebf4d..6674095 100644 --- a/src/declarative/qml/qmlrewrite.cpp +++ b/src/declarative/qml/qmlrewrite.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlrewrite_p.h" +#include <private/qmlrewrite_p.h> #include <QtCore/qdebug.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 3ee7b50..89336f3 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlscriptparser_p.h" -#include "qmlparser_p.h" +#include <private/qmlscriptparser_p.h> +#include <private/qmlparser_p.h> #include "parser/qmljsengine_p.h" #include "parser/qmljsparser_p.h" @@ -49,13 +49,13 @@ #include "parser/qmljsastvisitor_p.h" #include "parser/qmljsast_p.h" -#include "qmlrewrite_p.h" +#include <private/qmlrewrite_p.h> #include <QStack> #include <QCoreApplication> #include <QtDebug> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h index cb3e9e9..d6f57c3 100644 --- a/src/declarative/qml/qmlscriptparser_p.h +++ b/src/declarative/qml/qmlscriptparser_p.h @@ -55,7 +55,7 @@ #include <QtCore/QList> #include <QtCore/QUrl> #include <qmlerror.h> -#include "qmlparser_p.h" +#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index 3981d4c..8c4c7bf 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -41,7 +41,7 @@ #include <QtCore/qobject.h> #include <qmlengine.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptvalueiterator.h> #include <QtScript/qscriptcontext.h> @@ -51,11 +51,11 @@ #include <QtSql/qsqlquery.h> #include <QtSql/qsqlerror.h> #include <QtSql/qsqlrecord.h> -#include "qmlrefcount_p.h" -#include "qmlengine_p.h" +#include <private/qmlrefcount_p.h> +#include <private/qmlengine_p.h> #include <QtCore/qstack.h> #include <QtCore/qcryptographichash.h> -#include "qmlsqldatabase_p.h" +#include <private/qmlsqldatabase_p.h> #include <QtCore/qsettings.h> #include <QtCore/qdir.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qmlstringconverters.cpp b/src/declarative/qml/qmlstringconverters.cpp index 0f6ada9..872feba 100644 --- a/src/declarative/qml/qmlstringconverters.cpp +++ b/src/declarative/qml/qmlstringconverters.cpp @@ -45,7 +45,7 @@ #include <QtCore/qrect.h> #include <QtCore/qsize.h> #include <QtCore/qvariant.h> -#include "qmlstringconverters_p.h" +#include <private/qmlstringconverters_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp index ea2a4f3..1a38aa5 100644 --- a/src/declarative/qml/qmltypenamecache.cpp +++ b/src/declarative/qml/qmltypenamecache.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmltypenamecache_p.h" -#include "qmlengine_p.h" +#include <private/qmltypenamecache_p.h> +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h index 619a788..6ff403d 100644 --- a/src/declarative/qml/qmltypenamecache_p.h +++ b/src/declarative/qml/qmltypenamecache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlcleanup_p.h" +#include <private/qmlcleanup_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp index 9db3426..1f13f20 100644 --- a/src/declarative/qml/qmltypenamescriptclass.cpp +++ b/src/declarative/qml/qmltypenamescriptclass.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmltypenamescriptclass_p.h" -#include "qmlengine_p.h" -#include "qmltypenamecache_p.h" +#include <private/qmltypenamescriptclass_p.h> +#include <private/qmlengine_p.h> +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h index cec134d..f630854 100644 --- a/src/declarative/qml/qmltypenamescriptclass_p.h +++ b/src/declarative/qml/qmltypenamescriptclass_p.h @@ -54,7 +54,7 @@ // #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp index 859a93a..8a05312 100644 --- a/src/declarative/qml/qmlvaluetype.cpp +++ b/src/declarative/qml/qmlvaluetype.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlvaluetype_p.h" +#include <private/qmlvaluetype_p.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp index 3b1953a..b3b09be 100644 --- a/src/declarative/qml/qmlvaluetypescriptclass.cpp +++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlvaluetypescriptclass_p.h" -#include "qmlengine_p.h" +#include <private/qmlvaluetypescriptclass_p.h> +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 87672d0..3968d8d 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qmlvme_p.h" -#include "qmlcompiler_p.h" -#include "qfxperf_p_p.h" -#include "qmlboundsignal_p.h" -#include "qmlstringconverters_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qmldeclarativedata_p.h" +#include <private/qmlvme_p.h> +#include <private/qmlcompiler_p.h> +#include <private/qfxperf_p_p.h> +#include <private/qmlboundsignal_p.h> +#include <private/qmlstringconverters_p.h> +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmldeclarativedata_p.h> #include <qml.h> -#include "qmlcustomparser_p.h" +#include <private/qmlcustomparser_p.h> #include <QStack> #include <QWidget> #include <QColor> @@ -58,16 +58,16 @@ #include <qmlcontext.h> #include <qmlcomponent.h> #include <qmlbinding.h> -#include "qmlengine_p.h" -#include "qmlcomponent_p.h" -#include "qmlvmemetaobject_p.h" +#include <private/qmlengine_p.h> +#include <private/qmlcomponent_p.h> +#include <private/qmlvmemetaobject_p.h> #include <QtCore/qdebug.h> #include <QtCore/qvarlengtharray.h> #include <QtGui/qapplication.h> -#include "qmlbinding_p.h" -#include "qmlcontext_p.h" -#include "qmlbindingoptimizations_p.h" -#include "qmlglobal_p.h" +#include <private/qmlbinding_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmlbindingoptimizations_p.h> +#include <private/qmlglobal_p.h> #include <qmlscriptstring.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index a61d05a..f4f54ee 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -56,7 +56,7 @@ #include <QtCore/QString> #include <QtCore/QStack> #include <qmlerror.h> -#include "qbitfield_p.h" +#include <private/qbitfield_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index b7ee316..5e19347 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qmlvmemetaobject_p.h" +#include <private/qmlvmemetaobject_p.h> #include <qml.h> -#include "qmlrefcount_p.h" +#include <private/qmlrefcount_p.h> #include <QColor> #include <QDate> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> #include <qmlexpression.h> -#include "qmlcontext_p.h" +#include <private/qmlcontext_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp index 3216a6b..2ecb1d9 100644 --- a/src/declarative/qml/qmlwatcher.cpp +++ b/src/declarative/qml/qmlwatcher.cpp @@ -42,11 +42,11 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> #include <qmlexpression.h> -#include "qmldebugservice_p.h" +#include <private/qmldebugservice_p.h> #include <qmlcontext.h> #include <qml.h> -#include "qmlwatcher_p.h" +#include <private/qmlwatcher_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index a41d9c5..0437bd6 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qmlworkerscript_p.h" +#include <private/qmlworkerscript_p.h> #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> #include <QtScript/qscriptengine.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <QtScript/qscriptvalueiterator.h> diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp index f5100ef..18d3c55 100644 --- a/src/declarative/qml/qmlxmlhttprequest.cpp +++ b/src/declarative/qml/qmlxmlhttprequest.cpp @@ -41,16 +41,16 @@ #include <QtCore/qobject.h> #include <qmlengine.h> -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptengine.h> #include <QtNetwork/qnetworkreply.h> #include <QtCore/qxmlstream.h> -#include "qmlrefcount_p.h" -#include "qmlengine_p.h" +#include <private/qmlrefcount_p.h> +#include <private/qmlengine_p.h> #include <QtCore/qstack.h> -#include "qmlxmlhttprequest_p.h" +#include <private/qmlxmlhttprequest_p.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp index ae1db30..1f66393 100644 --- a/src/declarative/qml/rewriter/rewriter.cpp +++ b/src/declarative/qml/rewriter/rewriter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "rewriter_p.h" -#include "qmljsast_p.h" +#include <private/rewriter_p.h> +#include <private/qmljsast_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h index ed9be16..731621d 100644 --- a/src/declarative/qml/rewriter/rewriter_p.h +++ b/src/declarative/qml/rewriter/rewriter_p.h @@ -45,8 +45,8 @@ #include <QtCore/QList> #include <QtCore/QString> -#include "textwriter_p.h" -#include "qmljsastvisitor_p.h" +#include <private/textwriter_p.h> +#include <private/qmljsastvisitor_p.h> QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp index 8f89f12..876db4d 100644 --- a/src/declarative/qml/rewriter/textwriter.cpp +++ b/src/declarative/qml/rewriter/textwriter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "textwriter_p.h" +#include <private/textwriter_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h index 14c4726..f7b8b26 100644 --- a/src/declarative/qml/rewriter/textwriter_p.h +++ b/src/declarative/qml/rewriter/textwriter_p.h @@ -46,7 +46,7 @@ #include <QtCore/QList> #include <QtGui/QTextCursor> -#include "qmljsglobal_p.h" +#include <private/qmljsglobal_p.h> QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp index f62f810..9ffe9a9 100644 --- a/src/declarative/util/qfxperf.cpp +++ b/src/declarative/util/qfxperf.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h index e3f820c..0e12912 100644 --- a/src/declarative/util/qfxperf_p_p.h +++ b/src/declarative/util/qfxperf_p_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include "qperformancelog_p_p.h" +#include <private/qperformancelog_p_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index c78deb0..c6e8a18 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qmlanimation_p.h" +#include <private/qmlanimation_p.h> #include "qvariant.h" #include "qcolor.h" #include "qfile.h" #include "qmlpropertyvaluesource.h" #include "qml.h" #include "qmlinfo.h" -#include "qmlanimation_p_p.h" -#include "qmlbehavior_p.h" +#include <private/qmlanimation_p_p.h> +#include <private/qmlbehavior_p.h> #include <QParallelAnimationGroup> #include <QSequentialAnimationGroup> #include <QtCore/qset.h> @@ -55,10 +55,10 @@ #include <QtCore/qpoint.h> #include <QtCore/qsize.h> #include <qmlexpression.h> -#include "qmlstateoperations_p.h" -#include "qmlstringconverters_p.h" +#include <private/qmlstateoperations_p.h> +#include <private/qmlstringconverters_p.h> #include <private/qvariantanimation_p.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index ea48c19..87b6703 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -45,9 +45,9 @@ #include <QtCore/qvariant.h> #include <QtCore/QAbstractAnimation> #include <QtGui/qcolor.h> -#include "qmltransition_p.h" +#include <private/qmltransition_p.h> #include <qmlpropertyvaluesource.h> -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> #include <qml.h> #include <qmlscriptstring.h> diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index c1fe239..326e1c6 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -54,16 +54,16 @@ // #include <private/qobject_p.h> -#include "qmlnullablevalue_p_p.h" +#include <private/qmlnullablevalue_p_p.h> #include <private/qvariantanimation_p.h> #include <QtCore/QPauseAnimation> #include <QtCore/QVariantAnimation> #include <QtCore/QAnimationGroup> #include <QtGui/QColor> -#include "qmlanimation_p.h" +#include <private/qmlanimation_p.h> #include <qml.h> #include <qmlcontext.h> -#include "qmltimeline_p_p.h" +#include <private/qmltimeline_p_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp index 10de9fc..ca2cca5 100644 --- a/src/declarative/util/qmlbehavior.cpp +++ b/src/declarative/util/qmlbehavior.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <private/qobject_p.h> -#include "qmlanimation_p.h" -#include "qmltransition_p.h" -#include "qmlbehavior_p.h" +#include <private/qmlanimation_p.h> +#include <private/qmltransition_p.h> +#include <private/qmlbehavior_p.h> #include <qmlcontext.h> #include <qmlinfo.h> #include <QtCore/qparallelanimationgroup.h> diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h index b6426a3..581a0a8 100644 --- a/src/declarative/util/qmlbehavior_p.h +++ b/src/declarative/util/qmlbehavior_p.h @@ -45,7 +45,7 @@ #include <qmlpropertyvaluesource.h> #include <qmlpropertyvalueinterceptor.h> #include <qml.h> -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index ae0a2a6..fb2e9ee 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -47,8 +47,8 @@ #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptengine.h> -#include "qmlnullablevalue_p_p.h" -#include "qmlbind_p.h" +#include <private/qmlnullablevalue_p_p.h> +#include <private/qmlbind_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 59798a2..f01b7a9 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qmlconnection_p.h" +#include <private/qmlconnection_p.h> #include <qmlexpression.h> -#include "qmlboundsignal_p.h" +#include <private/qmlboundsignal_p.h> #include "private/qobject_p.h" #include <qmlcontext.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp index 983287e..4486912 100644 --- a/src/declarative/util/qmldatetimeformatter.cpp +++ b/src/declarative/util/qmldatetimeformatter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmldatetimeformatter_p.h" +#include <private/qmldatetimeformatter_p.h> #include "private/qobject_p.h" #include <QtCore/qlocale.h> diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index 60e48c8..0b844f9 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qmleasefollow_p.h" +#include <private/qmleasefollow_p.h> #include <qmlmetaproperty.h> #include <math.h> #include <QtCore/qdebug.h> -#include "qmlanimation_p_p.h" +#include <private/qmlanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp index ba06e19..4874f50 100644 --- a/src/declarative/util/qmlfontloader.cpp +++ b/src/declarative/util/qmlfontloader.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "private/qobject_p.h" -#include "qmlfontloader_p.h" +#include <private/qmlfontloader_p.h> #include <QUrl> #include <QDebug> #include <QNetworkRequest> diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp index 8c7e80a..140f0f9 100644 --- a/src/declarative/util/qmllistaccessor.cpp +++ b/src/declarative/util/qmllistaccessor.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qmllistaccessor_p.h" +#include <private/qmllistaccessor_p.h> #include <QStringList> #include <qmlmetatype.h> #include <QtCore/qdebug.h> // ### Remove me -#include "qmlengine_p.h" +#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 2ba4c35..d4cce0c 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -42,12 +42,12 @@ #include <QtCore/qdebug.h> #include <QtCore/qstack.h> #include <QXmlStreamReader> -#include "qmlcustomparser_p.h" -#include "qmlparser_p.h" -#include "qmlopenmetaobject_p.h" -#include "qmlengine_p.h" +#include <private/qmlcustomparser_p.h> +#include <private/qmlparser_p.h> +#include <private/qmlopenmetaobject_p.h> +#include <private/qmlengine_p.h> #include <qmlcontext.h> -#include "qmllistmodel_p.h" +#include <private/qmllistmodel_p.h> #include <QtScript/qscriptvalueiterator.h> #include "qmlinfo.h" diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index 7354296..d626060 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -48,7 +48,7 @@ #include <QtCore/QList> #include <QtCore/QVariant> #include <qml.h> -#include "qlistmodelinterface_p.h" +#include <private/qlistmodelinterface_p.h> #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp index fce35d9..ccc07ef 100644 --- a/src/declarative/util/qmlnumberformatter.cpp +++ b/src/declarative/util/qmlnumberformatter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlnumberformatter_p.h" +#include <private/qmlnumberformatter_p.h> #include "private/qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h index 98e5b92..346c2f0 100644 --- a/src/declarative/util/qmlnumberformatter_p.h +++ b/src/declarative/util/qmlnumberformatter_p.h @@ -43,7 +43,7 @@ #define QMLNUMBERFORMATTER_H #include <qml.h> -#include "qnumberformat_p.h" +#include <private/qnumberformat_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 1bbfbda..6fb624c 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qmlopenmetaobject_p.h" -#include "qmetaobjectbuilder_p.h" +#include <private/qmlopenmetaobject_p.h> +#include <private/qmetaobjectbuilder_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index 6bc1ef9..447a5d8 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "private/qobject_p.h" -#include "qmlpackage_p.h" +#include <private/qmlpackage_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index 49825db..d4143e8 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qmlpixmapcache_p.h" +#include <private/qmlpixmapcache_p.h> #include <QImageReader> #include <QHash> #include <QNetworkReply> #include <QPixmapCache> -#include "qfxperf_p_p.h" +#include <private/qfxperf_p_p.h> #include <qmlengine.h> #include <QFile> #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index 532cc2d..0fad226 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "private/qobject_p.h" -#include "qmlopenmetaobject_p.h" -#include "qmlpropertychanges_p.h" +#include <private/qmlopenmetaobject_p.h> +#include <private/qmlpropertychanges_p.h> #include <QtCore/qdebug.h> #include <qmlinfo.h> -#include "qmlcustomparser_p.h" -#include "qmlparser_p.h" +#include <private/qmlcustomparser_p.h> +#include <private/qmlparser_p.h> #include <qmlexpression.h> #include <qmlbinding.h> #include <qmlcontext.h> diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h index 461730d..2c0cba9 100644 --- a/src/declarative/util/qmlpropertychanges_p.h +++ b/src/declarative/util/qmlpropertychanges_p.h @@ -42,7 +42,7 @@ #ifndef QMLPROPERTYCHANGES_H #define QMLPROPERTYCHANGES_H -#include "qmlstateoperations_p.h" +#include <private/qmlstateoperations_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp index 0c398fd..c0e3340 100644 --- a/src/declarative/util/qmlpropertymap.cpp +++ b/src/declarative/util/qmlpropertymap.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlpropertymap.h" -#include "qmlopenmetaobject_p.h" +#include <private/qmlopenmetaobject_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index ffecad0..9cdadcf 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -43,8 +43,8 @@ #include <math.h> #include <QtCore/qdebug.h> #include "private/qobject_p.h" -#include "qmlspringfollow_p.h" -#include "qmlanimation_p_p.h" +#include <private/qmlspringfollow_p.h> +#include <private/qmlanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index a55308e..dd66107 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qmltransition_p.h" -#include "qmlstategroup_p.h" -#include "qmlstate_p_p.h" +#include <private/qmltransition_p.h> +#include <private/qmlstategroup_p.h> +#include <private/qmlstate_p_p.h> #include "qmlbinding.h" -#include "qmlstateoperations_p.h" -#include "qmlanimation_p.h" -#include "qmlanimation_p_p.h" -#include "qmlstate_p.h" +#include <private/qmlstateoperations_p.h> +#include <private/qmlanimation_p.h> +#include <private/qmlanimation_p_p.h> +#include <private/qmlstate_p.h> #include <QtCore/qdebug.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h index 5d3a7dd..75eb3fd 100644 --- a/src/declarative/util/qmlstate_p_p.h +++ b/src/declarative/util/qmlstate_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> #include <private/qobject_p.h> -#include "qmlanimation_p_p.h" -#include "qmltransitionmanager_p_p.h" +#include <private/qmlanimation_p_p.h> +#include <private/qmltransitionmanager_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index f6a0d1a..19408f8 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "private/qobject_p.h" -#include "qmlstategroup_p.h" -#include "qmltransition_p.h" -#include "qmlstate_p_p.h" +#include <private/qmlstategroup_p.h> +#include <private/qmltransition_p.h> +#include <private/qmlstate_p_p.h> #include <qmlbinding.h> #include <QtCore/qdebug.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h index 82cc504..ddd27d7 100644 --- a/src/declarative/util/qmlstategroup_p.h +++ b/src/declarative/util/qmlstategroup_p.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEGROUP_H #define QMLSTATEGROUP_H -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 560c86b..82fc9ba 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -43,11 +43,11 @@ #include <qml.h> #include <qmlcontext.h> #include <qmlexpression.h> -#include "qmlstateoperations_p.h" +#include <private/qmlstateoperations_p.h> #include <QtCore/qdebug.h> #include <qmlinfo.h> -#include "qmlgraphicsanchors_p_p.h" -#include "qmlgraphicsitem_p.h" +#include <private/qmlgraphicsanchors_p_p.h> +#include <private/qmlgraphicsitem_p.h> #include <QtGui/qgraphicsitem.h> #include <QtCore/qmath.h> diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h index 9e9dbd1..589fe20 100644 --- a/src/declarative/util/qmlstateoperations_p.h +++ b/src/declarative/util/qmlstateoperations_p.h @@ -42,9 +42,9 @@ #ifndef QMLSTATEOPERATIONS_H #define QMLSTATEOPERATIONS_H -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> #include <qmlgraphicsitem.h> -#include "qmlgraphicsanchors_p.h" +#include <private/qmlgraphicsanchors_p.h> #include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp index 4ddc82d..da08369 100644 --- a/src/declarative/util/qmlsystempalette.cpp +++ b/src/declarative/util/qmlsystempalette.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "private/qobject_p.h" -#include "qmlsystempalette_p.h" +#include <private/qmlsystempalette_p.h> #include <QApplication> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltimeline.cpp b/src/declarative/util/qmltimeline.cpp index e8695de..8b9a872 100644 --- a/src/declarative/util/qmltimeline.cpp +++ b/src/declarative/util/qmltimeline.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmltimeline_p_p.h" +#include <private/qmltimeline_p_p.h> #include <QDebug> #include <QMutex> #include <QThread> diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp index 9b54337..ad69369 100644 --- a/src/declarative/util/qmltimer.cpp +++ b/src/declarative/util/qmltimer.cpp @@ -42,7 +42,7 @@ #include "QtCore/qcoreapplication.h" #include "QtCore/qpauseanimation.h" #include "private/qobject_p.h" -#include "qmltimer_p.h" +#include <private/qmltimer_p.h> #include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index 204887c..ad79890 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qmlstate_p.h" -#include "qmlstategroup_p.h" -#include "qmlstate_p_p.h" -#include "qmlstateoperations_p.h" -#include "qmlanimation_p.h" -#include "qmlanimation_p_p.h" -#include "qmltransitionmanager_p_p.h" +#include <private/qmlstate_p.h> +#include <private/qmlstategroup_p.h> +#include <private/qmlstate_p_p.h> +#include <private/qmlstateoperations_p.h> +#include <private/qmlanimation_p.h> +#include <private/qmlanimation_p_p.h> +#include <private/qmltransitionmanager_p_p.h> #include <QParallelAnimationGroup> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h index ebc8b79..1891a6e 100644 --- a/src/declarative/util/qmltransition_p.h +++ b/src/declarative/util/qmltransition_p.h @@ -43,7 +43,7 @@ #define QMLTRANSITION_H #include <QtCore/qobject.h> -#include "qmlstate_p.h" +#include <private/qmlstate_p.h> #include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index da9a0dd..1a164c7 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qmlbinding.h> -#include "qmltransitionmanager_p_p.h" -#include "qmlstate_p_p.h" +#include <private/qmltransitionmanager_p_p.h> +#include <private/qmlstate_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h index c7e609f..9a05684 100644 --- a/src/declarative/util/qmltransitionmanager_p_p.h +++ b/src/declarative/util/qmltransitionmanager_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmlstateoperations_p.h" +#include <private/qmlstateoperations_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index dc14730..c4eb539 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -53,16 +53,16 @@ #include "qml.h" #include "qmlgraphicsitem.h" -#include "qperformancelog_p_p.h" -#include "qfxperf_p_p.h" +#include <private/qperformancelog_p_p.h> +#include <private/qfxperf_p_p.h> #include "qmlview.h" #include <qmlengine.h> #include <qmlcontext.h> -#include "qmldebug_p.h" -#include "qmldebugservice_p.h" +#include <private/qmldebug_p.h> +#include <private/qmldebugservice_p.h> #include <QtCore/qabstractanimation.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp index 2dfffbf..a274c6c 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmlxmllistmodel_p.h" +#include <private/qmlxmllistmodel_p.h> #include "private/qobject_p.h" #include <qmlcontext.h> diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h index 2b46515..2fa1be8 100644 --- a/src/declarative/util/qmlxmllistmodel_p.h +++ b/src/declarative/util/qmlxmllistmodel_p.h @@ -43,7 +43,7 @@ #define QMLXMLLISTMODEL_H #include <qml.h> -#include "qlistmodelinterface_p.h" +#include <private/qlistmodelinterface_p.h> #include <qmlinfo.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp index c6a03e9..68bb9e1 100644 --- a/src/declarative/util/qnumberformat.cpp +++ b/src/declarative/util/qnumberformat.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qnumberformat_p.h" +#include <private/qnumberformat_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qperformancelog.cpp b/src/declarative/util/qperformancelog.cpp index ff2f42e..83b0247 100644 --- a/src/declarative/util/qperformancelog.cpp +++ b/src/declarative/util/qperformancelog.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qperformancelog_p_p.h" +#include <private/qperformancelog_p_p.h> #include <QHash> #include <QDebug> diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index 0721102..3aaffe6 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "graphicslayouts_p.h" +#include <private/graphicslayouts_p.h> #include <QtGui/qgraphicswidget.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/widgets/graphicslayouts_p.h b/src/declarative/widgets/graphicslayouts_p.h index 32517b6..c44cb79 100644 --- a/src/declarative/widgets/graphicslayouts_p.h +++ b/src/declarative/widgets/graphicslayouts_p.h @@ -42,7 +42,7 @@ #ifndef GRAPHICSLAYOUTS_H #define GRAPHICSLAYOUTS_H -#include "graphicswidgets_p.h" +#include <private/graphicswidgets_p.h> #include <QtGui/QGraphicsLinearLayout> #include <QtGui/QGraphicsGridLayout> diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index 40ba93e..884a6e9 100644 --- a/src/declarative/widgets/graphicswidgets.cpp +++ b/src/declarative/widgets/graphicswidgets.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "graphicswidgets_p.h" +#include <private/graphicswidgets_p.h> QT_BEGIN_NAMESPACE |