diff options
Diffstat (limited to 'src/declarative/graphicsitems')
59 files changed, 142 insertions, 142 deletions
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> |