aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles/qquickparticlesystem_p.h
diff options
context:
space:
mode:
authorAriel Molina R <ariel@edis.mx>2015-11-18 18:01:37 -0600
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-11-24 06:15:57 +0000
commit7aa921ca62d14620f640fcc460fa79c4eeffa26c (patch)
tree073b33b84835b7f91564941de01679015edef6cc /src/particles/qquickparticlesystem_p.h
parent7b730ef660bedfe3aed1b2e778f492cdf76add59 (diff)
Private export the ParticleSystem and Affector
There are several special cases where the particle system is very useful for generating more than just eye candy. An example is a recreation of world weather/wind conditions as seen in http://earth.nullschool.net/ this patch allows for the implementation of similar systems. This patch does not adds features, just adds the macro Q_QUICK_PRIVATE_EXPORT in order to link the classes and derive custom C++ affectors for Qt Quick usage. Task-number: QTBUG-41502 Change-Id: I809d74676b3be73221840c694d7ca3eebe553c02 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/particles/qquickparticlesystem_p.h')
-rw-r--r--src/particles/qquickparticlesystem_p.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 96bd655793..7ad066cdfa 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -55,6 +55,7 @@
#include <QAbstractAnimation>
#include <QtQml/qqml.h>
#include <private/qv8engine_p.h> //For QQmlV4Handle
+#include "qtquickparticlesglobal_p.h"
QT_BEGIN_NAMESPACE
@@ -75,7 +76,7 @@ struct QQuickParticleDataHeapNode{
QSet<QQuickParticleData*> data;//Set ptrs instead?
};
-class QQuickParticleDataHeap {
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleDataHeap {
//Idea is to do a binary heap, but which also stores a set of int,Node* so that if the int already exists, you can
//add it to the data* list. Pops return the whole list at once.
public:
@@ -102,7 +103,7 @@ private:
QHash<int,int> m_lookups;
};
-class Q_AUTOTEST_EXPORT QQuickParticleGroupData {
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleGroupData {
public:
QQuickParticleGroupData(int id, QQuickParticleSystem* sys);
~QQuickParticleGroupData();
@@ -142,7 +143,7 @@ struct Color4ub {
uchar a;
};
-class Q_AUTOTEST_EXPORT QQuickParticleData {
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleData {
public:
//TODO: QObject like memory management (without the cost, just attached to system)
QQuickParticleData(QQuickParticleSystem* sys);
@@ -245,7 +246,7 @@ private:
QQuickV4ParticleData* v8Datum;
};
-class Q_AUTOTEST_EXPORT QQuickParticleSystem : public QQuickItem
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleSystem : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)