diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 01:39:06 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 01:39:06 (GMT) |
| commit | b443a7b302c2e87920ee62370a1f6bd828d23192 (patch) | |
| tree | b1e849f067a4e1ceb5590f58cdf8e5ffe0ae85d0 | |
| parent | d4f57234d93f224fb8498e8491bde0458cbf6bf3 (diff) | |
| parent | f9fa633257f856f03b6f8323506d1695e1705e5f (diff) | |
| download | Qt-b443a7b302c2e87920ee62370a1f6bd828d23192.zip Qt-b443a7b302c2e87920ee62370a1f6bd828d23192.tar.gz Qt-b443a7b302c2e87920ee62370a1f6bd828d23192.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/fx/qfxblendedimage.h | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxparticles.h | 8 | ||||
| -rw-r--r-- | src/declarative/fx/qfxvisualitemmodel.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxblendedimage.h b/src/declarative/fx/qfxblendedimage.h index 5cc0238..1cf4dc8 100644 --- a/src/declarative/fx/qfxblendedimage.h +++ b/src/declarative/fx/qfxblendedimage.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class QFxBlendedImage : public QFxItem +class Q_DECLARATIVE_EXPORT QFxBlendedImage : public QFxItem { Q_OBJECT diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index 0696e60..a879b2d 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -56,7 +56,7 @@ QT_MODULE(Declarative) class QFxParticle; class QFxParticles; -class QFxParticleMotion : public QObject +class Q_DECLARATIVE_EXPORT QFxParticleMotion : public QObject { Q_OBJECT public: @@ -68,7 +68,7 @@ public: }; QML_DECLARE_TYPE(QFxParticleMotion); -class QFxParticleMotionLinear : public QFxParticleMotion +class Q_DECLARATIVE_EXPORT QFxParticleMotionLinear : public QFxParticleMotion { Q_OBJECT public: @@ -79,7 +79,7 @@ public: }; QML_DECLARE_TYPE(QFxParticleMotionLinear); -class QFxParticleMotionGravity : public QFxParticleMotion +class Q_DECLARATIVE_EXPORT QFxParticleMotionGravity : public QFxParticleMotion { Q_OBJECT @@ -108,7 +108,7 @@ private: }; QML_DECLARE_TYPE(QFxParticleMotionGravity); -class QFxParticleMotionWander : public QFxParticleMotion +class Q_DECLARATIVE_EXPORT QFxParticleMotionWander : public QFxParticleMotion { Q_OBJECT public: diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qfxvisualitemmodel.h index 33017e2..5db5209 100644 --- a/src/declarative/fx/qfxvisualitemmodel.h +++ b/src/declarative/fx/qfxvisualitemmodel.h @@ -62,7 +62,7 @@ class QFxItem; class QmlComponent; class QmlPackage; class QFxVisualItemModelPrivate; -class QFxVisualItemModel : public QObject +class Q_DECLARATIVE_EXPORT QFxVisualItemModel : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QFxVisualItemModel) |