aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Shalayel <sami.shalayel@qt.io>2023-01-11 15:07:39 +0100
committerSami Shalayel <sami.shalayel@qt.io>2023-01-24 13:41:52 +0100
commit08e01f457d70ce4dcc23187b3b56260f0ec00435 (patch)
treec1f76b3214a1b781d795a3148fb034e566b2c896
parente1cebe812838c8c98bca07413a023673706c45b8 (diff)
QuickParticles: export classes exposed to QML
Add export macros to all classes exposing their behavior to QML using QML_NAMED_ELEMENT and friends. This allows qmltc to compile qml files using Quick.Particles without linker errors. Change-Id: Iccbe33410460e211b4f8b631237f95c270d79187 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/particles/qquickage_p.h2
-rw-r--r--src/particles/qquickangledirection_p.h3
-rw-r--r--src/particles/qquickcumulativedirection_p.h3
-rw-r--r--src/particles/qquickcustomaffector_p.h2
-rw-r--r--src/particles/qquickdirection_p.h3
-rw-r--r--src/particles/qquickellipseextruder_p.h2
-rw-r--r--src/particles/qquickfriction_p.h2
-rw-r--r--src/particles/qquickgravity_p.h2
-rw-r--r--src/particles/qquickgroupgoal_p.h2
-rw-r--r--src/particles/qquickimageparticle_p.h2
-rw-r--r--src/particles/qquickitemparticle_p.h2
-rw-r--r--src/particles/qquicklineextruder_p.h2
-rw-r--r--src/particles/qquickmaskextruder_p.h2
-rw-r--r--src/particles/qquickparticleextruder_p.h3
-rw-r--r--src/particles/qquickparticlegroup_p.h3
-rw-r--r--src/particles/qquickparticlepainter_p.h2
-rw-r--r--src/particles/qquickpointattractor_p.h2
-rw-r--r--src/particles/qquickpointdirection_p.h2
-rw-r--r--src/particles/qquickrectangleextruder_p.h2
-rw-r--r--src/particles/qquickspritegoal_p.h2
-rw-r--r--src/particles/qquicktargetdirection_p.h2
-rw-r--r--src/particles/qquicktrailemitter_p.h2
-rw-r--r--src/particles/qquickturbulence_p.h2
-rw-r--r--src/particles/qquickwander_p.h2
24 files changed, 29 insertions, 24 deletions
diff --git a/src/particles/qquickage_p.h b/src/particles/qquickage_p.h
index 91dadebaab..499d915568 100644
--- a/src/particles/qquickage_p.h
+++ b/src/particles/qquickage_p.h
@@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
-class QQuickAgeAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickAgeAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(int lifeLeft READ lifeLeft WRITE setLifeLeft NOTIFY lifeLeftChanged)
diff --git a/src/particles/qquickangledirection_p.h b/src/particles/qquickangledirection_p.h
index bfcb26a197..17e9fddb3b 100644
--- a/src/particles/qquickangledirection_p.h
+++ b/src/particles/qquickangledirection_p.h
@@ -15,11 +15,12 @@
// We mean it.
//
#include "qquickdirection_p.h"
+#include <QtQuickParticles/private/qtquickparticlesexports_p.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
-class QQuickAngleDirection : public QQuickDirection
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickAngleDirection : public QQuickDirection
{
Q_OBJECT
Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
diff --git a/src/particles/qquickcumulativedirection_p.h b/src/particles/qquickcumulativedirection_p.h
index f778068417..826c0ac1d0 100644
--- a/src/particles/qquickcumulativedirection_p.h
+++ b/src/particles/qquickcumulativedirection_p.h
@@ -17,10 +17,11 @@
#include "qquickdirection_p.h"
#include <QQmlListProperty>
#include <QtQml/qqml.h>
+#include <QtQuickParticles/private/qtquickparticlesexports_p.h>
QT_BEGIN_NAMESPACE
-class QQuickCumulativeDirection : public QQuickDirection
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickCumulativeDirection : public QQuickDirection
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<QQuickDirection> directions READ directions)
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h
index 6598ab77e8..ae97995265 100644
--- a/src/particles/qquickcustomaffector_p.h
+++ b/src/particles/qquickcustomaffector_p.h
@@ -24,7 +24,7 @@
QT_BEGIN_NAMESPACE
-class QQuickCustomAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickCustomAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(bool relative READ relative WRITE setRelative NOTIFY relativeChanged)
diff --git a/src/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h
index 2ab457b5b4..534d1a6de2 100644
--- a/src/particles/qquickdirection_p.h
+++ b/src/particles/qquickdirection_p.h
@@ -19,10 +19,11 @@
#include <QPointF>
#include <QtQml/qqml.h>
#include <QtCore/private/qglobal_p.h>
+#include <QtQuickParticles/private/qtquickparticlesexports_p.h>
QT_BEGIN_NAMESPACE
-class QQuickDirection : public QObject
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickDirection : public QObject
{
Q_OBJECT
QML_NAMED_ELEMENT(NullVector)
diff --git a/src/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h
index 6d2d1ed7cf..c46b5faaad 100644
--- a/src/particles/qquickellipseextruder_p.h
+++ b/src/particles/qquickellipseextruder_p.h
@@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
-class QQuickEllipseExtruder : public QQuickParticleExtruder
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickEllipseExtruder : public QQuickParticleExtruder
{
Q_OBJECT
Q_PROPERTY(bool fill READ fill WRITE setFill NOTIFY fillChanged)//###Use base class? If it's still box
diff --git a/src/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h
index f192f36b95..3f0abffe68 100644
--- a/src/particles/qquickfriction_p.h
+++ b/src/particles/qquickfriction_p.h
@@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
-class QQuickFrictionAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickFrictionAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h
index 5843418be4..4793a9eb5b 100644
--- a/src/particles/qquickgravity_p.h
+++ b/src/particles/qquickgravity_p.h
@@ -19,7 +19,7 @@
QT_BEGIN_NAMESPACE
-class QQuickGravityAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickGravityAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(qreal magnitude READ magnitude WRITE setMagnitude NOTIFY magnitudeChanged)
diff --git a/src/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h
index 793bc0314c..869ec3a339 100644
--- a/src/particles/qquickgroupgoal_p.h
+++ b/src/particles/qquickgroupgoal_p.h
@@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE
class QQuickStochasticEngine;
-class QQuickGroupGoalAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickGroupGoalAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(QString goalState READ goalState WRITE setGoalState NOTIFY goalStateChanged)
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h
index 9b80aef0a1..e92e341718 100644
--- a/src/particles/qquickimageparticle_p.h
+++ b/src/particles/qquickimageparticle_p.h
@@ -146,7 +146,7 @@ public:
virtual ImageMaterialData *state() = 0;
};
-class QQuickImageParticle : public QQuickParticlePainter
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickImageParticle : public QQuickParticlePainter
{
Q_OBJECT
Q_PROPERTY(QUrl source READ image WRITE setImage NOTIFY imageChanged)
diff --git a/src/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h
index 80d31f84bb..9d4e1b8f62 100644
--- a/src/particles/qquickitemparticle_p.h
+++ b/src/particles/qquickitemparticle_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
class QQuickItemParticleAttached;
-class QQuickItemParticle : public QQuickParticlePainter
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickItemParticle : public QQuickParticlePainter
{
Q_OBJECT
Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged)
diff --git a/src/particles/qquicklineextruder_p.h b/src/particles/qquicklineextruder_p.h
index 8eb4b9b96b..547bb4bbab 100644
--- a/src/particles/qquicklineextruder_p.h
+++ b/src/particles/qquicklineextruder_p.h
@@ -16,7 +16,7 @@
//
#include "qquickparticleextruder_p.h"
-class QQuickLineExtruder : public QQuickParticleExtruder
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickLineExtruder : public QQuickParticleExtruder
{
Q_OBJECT
//Default is topleft to bottom right. Flipped makes it topright to bottom left
diff --git a/src/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h
index 2e173eeb98..fcceb69a26 100644
--- a/src/particles/qquickmaskextruder_p.h
+++ b/src/particles/qquickmaskextruder_p.h
@@ -21,7 +21,7 @@
QT_BEGIN_NAMESPACE
-class QQuickMaskExtruder : public QQuickParticleExtruder
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickMaskExtruder : public QQuickParticleExtruder
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h
index 80eb80b292..e3c72dd96f 100644
--- a/src/particles/qquickparticleextruder_p.h
+++ b/src/particles/qquickparticleextruder_p.h
@@ -20,10 +20,11 @@
#include <QPointF>
#include <QtQml/qqml.h>
#include <QtCore/private/qglobal_p.h>
+#include <QtQuickParticles/private/qtquickparticlesexports_p.h>
QT_BEGIN_NAMESPACE
-class QQuickParticleExtruder : public QObject
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleExtruder : public QObject
{
Q_OBJECT
diff --git a/src/particles/qquickparticlegroup_p.h b/src/particles/qquickparticlegroup_p.h
index a8bc9d55f0..528722243a 100644
--- a/src/particles/qquickparticlegroup_p.h
+++ b/src/particles/qquickparticlegroup_p.h
@@ -19,7 +19,8 @@
QT_BEGIN_NAMESPACE
-class QQuickParticleGroup : public QQuickStochasticState, public QQmlParserStatus
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleGroup : public QQuickStochasticState,
+ public QQmlParserStatus
{
Q_OBJECT
Q_PROPERTY(QQuickParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h
index e294be03c3..8488971d52 100644
--- a/src/particles/qquickparticlepainter_p.h
+++ b/src/particles/qquickparticlepainter_p.h
@@ -22,7 +22,7 @@
QT_BEGIN_NAMESPACE
-class QQuickParticlePainter : public QQuickItem
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticlePainter : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QQuickParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h
index 7dc0b319d9..d0ea8878fc 100644
--- a/src/particles/qquickpointattractor_p.h
+++ b/src/particles/qquickpointattractor_p.h
@@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
-class QQuickAttractorAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickAttractorAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged)
diff --git a/src/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h
index d326a3d953..425ad7da71 100644
--- a/src/particles/qquickpointdirection_p.h
+++ b/src/particles/qquickpointdirection_p.h
@@ -18,7 +18,7 @@
QT_BEGIN_NAMESPACE
-class QQuickPointDirection : public QQuickDirection
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickPointDirection : public QQuickDirection
{
Q_OBJECT
Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged)
diff --git a/src/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h
index 18087f4fbc..781df422a9 100644
--- a/src/particles/qquickrectangleextruder_p.h
+++ b/src/particles/qquickrectangleextruder_p.h
@@ -19,7 +19,7 @@
QT_BEGIN_NAMESPACE
-class QQuickRectangleExtruder : public QQuickParticleExtruder
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickRectangleExtruder : public QQuickParticleExtruder
{
Q_OBJECT
Q_PROPERTY(bool fill READ fill WRITE setFill NOTIFY fillChanged)
diff --git a/src/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h
index 6da6b910af..5113593972 100644
--- a/src/particles/qquickspritegoal_p.h
+++ b/src/particles/qquickspritegoal_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
class QQuickStochasticEngine;
-class QQuickSpriteGoalAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickSpriteGoalAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(QString goalState READ goalState WRITE setGoalState NOTIFY goalStateChanged)
diff --git a/src/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h
index 3bdb5f9c19..3ab2550be6 100644
--- a/src/particles/qquicktargetdirection_p.h
+++ b/src/particles/qquicktargetdirection_p.h
@@ -20,7 +20,7 @@
QT_BEGIN_NAMESPACE
class QQuickItem;
-class QQuickTargetDirection : public QQuickDirection
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickTargetDirection : public QQuickDirection
{
Q_OBJECT
Q_PROPERTY(qreal targetX READ targetX WRITE setTargetX NOTIFY targetXChanged)
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h
index ef8f4a4eb4..d6d0bad9b8 100644
--- a/src/particles/qquicktrailemitter_p.h
+++ b/src/particles/qquicktrailemitter_p.h
@@ -19,7 +19,7 @@
QT_BEGIN_NAMESPACE
-class QQuickTrailEmitter : public QQuickParticleEmitter
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickTrailEmitter : public QQuickParticleEmitter
{
Q_OBJECT
Q_PROPERTY(QString follow READ follow WRITE setFollow NOTIFY followChanged)
diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h
index 3fff9e12c3..c83b6252dc 100644
--- a/src/particles/qquickturbulence_p.h
+++ b/src/particles/qquickturbulence_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
class QQuickParticlePainter;
-class QQuickTurbulenceAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickTurbulenceAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged)
diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h
index 7a19b47c18..10914a76da 100644
--- a/src/particles/qquickwander_p.h
+++ b/src/particles/qquickwander_p.h
@@ -28,7 +28,7 @@ struct WanderData{
qreal y_var;
};
-class QQuickWanderAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickWanderAffector : public QQuickParticleAffector
{
Q_OBJECT
Q_PROPERTY(qreal pace READ pace WRITE setPace NOTIFY paceChanged)