diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-11 13:47:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 06:38:09 +0200 |
| commit | 4442dea01b9d4d45964228ac442166d89f091f9e (patch) | |
| tree | 28ae20cb26967765a988b1ee522fc2d64d777671 /src/imports/particles/V1 | |
| parent | b119220da60453ecf31898f7a57eda9d3c4e9225 (diff) | |
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/imports/particles/V1')
| -rw-r--r-- | src/imports/particles/V1/qdeclarativeparticles.cpp | 6 | ||||
| -rw-r--r-- | src/imports/particles/V1/qdeclarativeparticles_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/particles/V1/qdeclarativeparticles.cpp b/src/imports/particles/V1/qdeclarativeparticles.cpp index 62b2d49805..f307109ee8 100644 --- a/src/imports/particles/V1/qdeclarativeparticles.cpp +++ b/src/imports/particles/V1/qdeclarativeparticles.cpp @@ -42,9 +42,9 @@ #include "qdeclarativeparticles_p.h" #include <qdeclarativeinfo.h> -#include <private/qdeclarativeitem_p.h> +#include <QtQuick1/private/qdeclarativeitem_p.h> -#include <private/qdeclarativepixmapcache_p.h> +#include <QtQuick1/private/qdeclarativepixmapcache_p.h> #include <QtCore/QAbstractAnimation> #include <QPainter> @@ -446,7 +446,7 @@ public: void updateOpacity(QDeclarativeParticle &p, int age); QUrl url; - QDeclarativePixmap image; + QDeclarative1Pixmap image; int count; int emissionRate; qreal emissionVariance; diff --git a/src/imports/particles/V1/qdeclarativeparticles_p.h b/src/imports/particles/V1/qdeclarativeparticles_p.h index f66531cbce..d0e6c0857b 100644 --- a/src/imports/particles/V1/qdeclarativeparticles_p.h +++ b/src/imports/particles/V1/qdeclarativeparticles_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARTICLES_H #define QDECLARATIVEPARTICLES_H -#include <QtDeclarative/qdeclarativeitem.h> +#include <QtQuick1/qdeclarativeitem.h> QT_BEGIN_HEADER |