diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-12 23:58:33 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-12 23:58:33 (GMT) |
| commit | aa541b875bbaa514d90a5fa9ea6119e8a525db55 (patch) | |
| tree | d11722f7bc2203950fe52c14008a814e0db4b9a2 /src/declarative/graphicsitems | |
| parent | 4e3f88c8b1d74b720bf3e17f9bdedf84a9748b3d (diff) | |
| download | Qt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.zip Qt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.tar.gz Qt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.tar.bz2 | |
Do not use "QtDeclarative/XXX" style includes in declarative module code,
as it breaks reinstalling the module against existing Qt.
Diffstat (limited to 'src/declarative/graphicsitems')
28 files changed, 33 insertions, 33 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp index 655e03d..61b6ecc 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp @@ -43,7 +43,7 @@ #include "qmlgraphicsitem.h" #include "qmlgraphicsitem_p.h" #include <QDebug> -#include <QtDeclarative/qmlinfo.h> +#include <qmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h index f6e9e1a..bdddafe 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h @@ -43,8 +43,8 @@ #define QMLGRAPHICSANCHORS_H #include <QtCore/QObject> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qml.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp index 8c91056..97fdc6a 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QMovie> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> #include "qmlgraphicsanimatedimage_p.h" #include "qmlgraphicsanimatedimage_p_p.h" #include <QNetworkRequest> diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index fba9d69..634215e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -44,7 +44,7 @@ #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h index 9cab18e..567a509 100644 --- a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDeclarative/qml.h> +#include <qml.h> #include <QtCore/qobject.h> #include <QtGui/qevent.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h index 08b0fd8..10447f6 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFLICKABLE_H #define QMLGRAPHICSFLICKABLE_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index c61f996..57d2ee1 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -42,7 +42,7 @@ #include "qmlgraphicsflipable_p.h" #include "private/qmlgraphicsitem_p.h" #include "QtGui/qgraphicstransform.h" -#include <QtDeclarative/qmlinfo.h> +#include <qmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h index 23b6c76..8f075ac 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <QtGui/QTransform> -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <QtGui/qvector3d.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h index d014da2..d1824e7 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFOCUSPANEL_H #define QMLGRAPHICSFOCUSPANEL_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h index 813a999..3744240 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFOCUSSCOPE_H #define QMLGRAPHICSFOCUSSCOPE_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h index 10f08bd..7d16685 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H #define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index e86b53d..0b57540 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -44,7 +44,7 @@ #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> #include <private/qmlpixmapcache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h index 0968d99..8144ce0 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSIMAGEBASE_H #define QMLGRAPHICSIMAGEBASE_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index aa5c4cb..69564c4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -51,7 +51,7 @@ #include <QtGui/qgraphicstransform.h> #include <QtGui/qgraphicseffect.h> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> #include <private/qmlopenmetaobject_p.h> #include <private/qmlstate_p.h> #include <private/qlistmodelinterface_p.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h index f64964c..2ac43b5 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem.h @@ -44,8 +44,8 @@ #include <QtCore/QObject> #include <QtCore/QList> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlcomponent.h> +#include <qml.h> +#include <qmlcomponent.h> #include <QtGui/qgraphicsitem.h> #include <QtGui/qgraphicstransform.h> #include <QtGui/qfont.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index e1d7342..0c722ac 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <private/qmlstate_p.h> #include <private/qmlgraphicsanchors_p.h> #include <private/qmlnullablevalue_p_p.h> #include <private/qmlgraphicsanchors_p_p.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlcontext.h> +#include <qml.h> +#include <qmlcontext.h> #include <QtCore/qlist.h> #include <private/qgraphicsitem_p.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h index ad516b4..bca65fa 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsloader_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSLOADER_H #define QMLGRAPHICSLOADER_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h index 9c3398a..998183d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSMOUSEREGION_H #define QMLGRAPHICSMOUSEREGION_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h index 8d629b3..0805330 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSIMAGEITEM_H #define QMLGRAPHICSIMAGEITEM_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h index 2554605..02c4e6d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSPARTICLES_H #define QMLGRAPHICSPARTICLES_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h index 8abfb2a..4b0c772 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h @@ -44,8 +44,8 @@ #include <QtCore/QObject> #include <QtGui/QPainterPath> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qml.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h index 59118d4..38f1cd8 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSPATHVIEW_H #define QMLGRAPHICSPATHVIEW_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <private/qmlgraphicspath_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h index 56adc8b..a0665ae 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <QtCore/QString> -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <private/qmlstate_p.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h index 2f0a518..fe8c403 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSRECT_H #define QMLGRAPHICSRECT_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <QtGui/qbrush.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h index 4058df0..c5d0166 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSREPEATER_H #define QMLGRAPHICSREPEATER_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index d4ae0a6..82e0a94 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -45,7 +45,7 @@ #include <QtCore/QString> #include <QtCore/QObject> #include <private/qmlpixmapcache_p.h> -#include <QtDeclarative/qml.h> +#include <qml.h> #include "qmlgraphicsborderimage_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h index 31b049a..b6a5932 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSTEXT_H #define QMLGRAPHICSTEXT_H -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h index 3ff2a74..9855867 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <QtCore/qabstractitemmodel.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER |