diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-04-01 09:35:50 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-02 14:00:58 +0000 |
commit | 7b096b1de9691ddef8445102cc9f71b90aa31cee (patch) | |
tree | 654d36883afaca4d610b3c9a4e8990a7e4e41721 /src/animation | |
parent | f3259300bde381b10cb737735fe19b039c969782 (diff) |
Switch export macros to standard form
Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.
Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from
src/doc/qt3d.qdocconf
Task-number: QTBUG-74752
Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/animation')
33 files changed, 35 insertions, 35 deletions
diff --git a/src/animation/frontend/qabstractanimation.h b/src/animation/frontend/qabstractanimation.h index 951e2dd2d..1d7459217 100644 --- a/src/animation/frontend/qabstractanimation.h +++ b/src/animation/frontend/qabstractanimation.h @@ -48,7 +48,7 @@ namespace Qt3DAnimation { class QAbstractAnimationPrivate; -class QT3DANIMATIONSHARED_EXPORT QAbstractAnimation : public QObject +class Q_3DANIMATIONSHARED_EXPORT QAbstractAnimation : public QObject { Q_OBJECT Q_PROPERTY(QString animationName READ animationName WRITE setAnimationName NOTIFY animationNameChanged) diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h index 6190550e6..79464b13d 100644 --- a/src/animation/frontend/qabstractanimationclip.h +++ b/src/animation/frontend/qabstractanimationclip.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QAbstractAnimationClipPrivate; -class QT3DANIMATIONSHARED_EXPORT QAbstractAnimationClip : public Qt3DCore::QNode +class Q_3DANIMATIONSHARED_EXPORT QAbstractAnimationClip : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(float duration READ duration NOTIFY durationChanged) diff --git a/src/animation/frontend/qabstractchannelmapping.h b/src/animation/frontend/qabstractchannelmapping.h index 564f51191..1fd451a2a 100644 --- a/src/animation/frontend/qabstractchannelmapping.h +++ b/src/animation/frontend/qabstractchannelmapping.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QAbstractChannelMappingPrivate; -class QT3DANIMATIONSHARED_EXPORT QAbstractChannelMapping : public Qt3DCore::QNode +class Q_3DANIMATIONSHARED_EXPORT QAbstractChannelMapping : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/animation/frontend/qabstractclipanimator.h b/src/animation/frontend/qabstractclipanimator.h index 08bf1f5dc..a3bce0600 100644 --- a/src/animation/frontend/qabstractclipanimator.h +++ b/src/animation/frontend/qabstractclipanimator.h @@ -52,7 +52,7 @@ class QChannelMapper; class QClock; class QAbstractClipAnimatorPrivate; -class QT3DANIMATIONSHARED_EXPORT QAbstractClipAnimator : public Qt3DCore::QComponent +class Q_3DANIMATIONSHARED_EXPORT QAbstractClipAnimator : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) diff --git a/src/animation/frontend/qabstractclipblendnode.h b/src/animation/frontend/qabstractclipblendnode.h index d981bd7a5..3bc6d37d0 100644 --- a/src/animation/frontend/qabstractclipblendnode.h +++ b/src/animation/frontend/qabstractclipblendnode.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QAbstractAnimationClip; class QAbstractClipBlendNodePrivate; -class QT3DANIMATIONSHARED_EXPORT QAbstractClipBlendNode : public Qt3DCore::QNode +class Q_3DANIMATIONSHARED_EXPORT QAbstractClipBlendNode : public Qt3DCore::QNode { Q_OBJECT public: diff --git a/src/animation/frontend/qadditiveclipblend.h b/src/animation/frontend/qadditiveclipblend.h index 0771bd032..70c5b3cea 100644 --- a/src/animation/frontend/qadditiveclipblend.h +++ b/src/animation/frontend/qadditiveclipblend.h @@ -45,7 +45,7 @@ namespace Qt3DAnimation { class QAdditiveClipBlendPrivate; -class QT3DANIMATIONSHARED_EXPORT QAdditiveClipBlend : public QAbstractClipBlendNode +class Q_3DANIMATIONSHARED_EXPORT QAdditiveClipBlend : public QAbstractClipBlendNode { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAbstractClipBlendNode *baseClip READ baseClip WRITE setBaseClip NOTIFY baseClipChanged) diff --git a/src/animation/frontend/qanimationaspect.h b/src/animation/frontend/qanimationaspect.h index bd3745fec..280c643e6 100644 --- a/src/animation/frontend/qanimationaspect.h +++ b/src/animation/frontend/qanimationaspect.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QAnimationAspectPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationAspect : public Qt3DCore::QAbstractAspect +class Q_3DANIMATIONSHARED_EXPORT QAnimationAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: diff --git a/src/animation/frontend/qanimationcallback.h b/src/animation/frontend/qanimationcallback.h index 1fcbd657c..f7abb4a29 100644 --- a/src/animation/frontend/qanimationcallback.h +++ b/src/animation/frontend/qanimationcallback.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { -class QT3DANIMATIONSHARED_EXPORT QAnimationCallback +class Q_3DANIMATIONSHARED_EXPORT QAnimationCallback { public: enum Flag { diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h index 4781641e0..cec758704 100644 --- a/src/animation/frontend/qanimationclip.h +++ b/src/animation/frontend/qanimationclip.h @@ -50,7 +50,7 @@ namespace Qt3DAnimation { class QAnimationClipPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationClip : public QAbstractAnimationClip +class Q_3DANIMATIONSHARED_EXPORT QAnimationClip : public QAbstractAnimationClip { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAnimationClipData clipData READ clipData WRITE setClipData NOTIFY clipDataChanged) diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h index 605b17208..d0e35527e 100644 --- a/src/animation/frontend/qanimationclipdata.h +++ b/src/animation/frontend/qanimationclipdata.h @@ -51,7 +51,7 @@ namespace Qt3DAnimation { class QAnimationClipDataPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationClipData +class Q_3DANIMATIONSHARED_EXPORT QAnimationClipData { public: QAnimationClipData(); diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h index 2106d0f31..bf82f742e 100644 --- a/src/animation/frontend/qanimationcliploader.h +++ b/src/animation/frontend/qanimationcliploader.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QAnimationClipLoaderPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationClipLoader : public QAbstractAnimationClip +class Q_3DANIMATIONSHARED_EXPORT QAnimationClipLoader : public QAbstractAnimationClip { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/animation/frontend/qanimationcontroller.h b/src/animation/frontend/qanimationcontroller.h index ae3272517..47f2e0edd 100644 --- a/src/animation/frontend/qanimationcontroller.h +++ b/src/animation/frontend/qanimationcontroller.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QAnimationControllerPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationController : public QObject +class Q_3DANIMATIONSHARED_EXPORT QAnimationController : public QObject { Q_OBJECT Q_PROPERTY(int activeAnimationGroup READ activeAnimationGroup WRITE setActiveAnimationGroup NOTIFY activeAnimationGroupChanged) diff --git a/src/animation/frontend/qanimationgroup.h b/src/animation/frontend/qanimationgroup.h index a4f34c815..dd18edafc 100644 --- a/src/animation/frontend/qanimationgroup.h +++ b/src/animation/frontend/qanimationgroup.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QAnimationGroupPrivate; -class QT3DANIMATIONSHARED_EXPORT QAnimationGroup : public QObject +class Q_3DANIMATIONSHARED_EXPORT QAnimationGroup : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) diff --git a/src/animation/frontend/qblendedclipanimator.h b/src/animation/frontend/qblendedclipanimator.h index 064a83dc7..f4463802f 100644 --- a/src/animation/frontend/qblendedclipanimator.h +++ b/src/animation/frontend/qblendedclipanimator.h @@ -50,7 +50,7 @@ namespace Qt3DAnimation { class QAbstractClipBlendNode; class QBlendedClipAnimatorPrivate; -class QT3DANIMATIONSHARED_EXPORT QBlendedClipAnimator : public Qt3DAnimation::QAbstractClipAnimator +class Q_3DANIMATIONSHARED_EXPORT QBlendedClipAnimator : public Qt3DAnimation::QAbstractClipAnimator { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAbstractClipBlendNode *blendTree READ blendTree WRITE setBlendTree NOTIFY blendTreeChanged) diff --git a/src/animation/frontend/qcallbackmapping.h b/src/animation/frontend/qcallbackmapping.h index c52e284ff..b98a3b430 100644 --- a/src/animation/frontend/qcallbackmapping.h +++ b/src/animation/frontend/qcallbackmapping.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QCallbackMappingPrivate; -class QT3DANIMATIONSHARED_EXPORT QCallbackMapping : public QAbstractChannelMapping +class Q_3DANIMATIONSHARED_EXPORT QCallbackMapping : public QAbstractChannelMapping { Q_OBJECT Q_PROPERTY(QString channelName READ channelName WRITE setChannelName NOTIFY channelNameChanged) diff --git a/src/animation/frontend/qchannel.h b/src/animation/frontend/qchannel.h index 50e574756..4c856dba5 100644 --- a/src/animation/frontend/qchannel.h +++ b/src/animation/frontend/qchannel.h @@ -51,7 +51,7 @@ namespace Qt3DAnimation { class QChannelPrivate; -class QT3DANIMATIONSHARED_EXPORT QChannel +class Q_3DANIMATIONSHARED_EXPORT QChannel { public: QChannel(); diff --git a/src/animation/frontend/qchannelcomponent.h b/src/animation/frontend/qchannelcomponent.h index 922073a85..aa29d7fd5 100644 --- a/src/animation/frontend/qchannelcomponent.h +++ b/src/animation/frontend/qchannelcomponent.h @@ -51,7 +51,7 @@ namespace Qt3DAnimation { class QChannelComponentPrivate; -class QT3DANIMATIONSHARED_EXPORT QChannelComponent +class Q_3DANIMATIONSHARED_EXPORT QChannelComponent { public: QChannelComponent(); diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h index a14fbcdd4..cb5532265 100644 --- a/src/animation/frontend/qchannelmapper.h +++ b/src/animation/frontend/qchannelmapper.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QChannelMapperPrivate; class QAbstractChannelMapping; -class QT3DANIMATIONSHARED_EXPORT QChannelMapper : public Qt3DCore::QNode +class Q_3DANIMATIONSHARED_EXPORT QChannelMapper : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/animation/frontend/qchannelmapping.h b/src/animation/frontend/qchannelmapping.h index 776a2f846..e88e6daa9 100644 --- a/src/animation/frontend/qchannelmapping.h +++ b/src/animation/frontend/qchannelmapping.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QChannelMappingPrivate; -class QT3DANIMATIONSHARED_EXPORT QChannelMapping : public QAbstractChannelMapping +class Q_3DANIMATIONSHARED_EXPORT QChannelMapping : public QAbstractChannelMapping { Q_OBJECT Q_PROPERTY(QString channelName READ channelName WRITE setChannelName NOTIFY channelNameChanged) diff --git a/src/animation/frontend/qchannelmappingcreatedchange_p.h b/src/animation/frontend/qchannelmappingcreatedchange_p.h index b01a97acc..527ab524a 100644 --- a/src/animation/frontend/qchannelmappingcreatedchange_p.h +++ b/src/animation/frontend/qchannelmappingcreatedchange_p.h @@ -58,7 +58,7 @@ namespace Qt3DAnimation { class QChannelMappingCreatedChangeBasePrivate; -class QT3DANIMATIONSHARED_PRIVATE_EXPORT QChannelMappingCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase +class Q_3DANIMATIONSHARED_PRIVATE_EXPORT QChannelMappingCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase { public: explicit QChannelMappingCreatedChangeBase(const QAbstractChannelMapping *mapping); diff --git a/src/animation/frontend/qclipanimator.h b/src/animation/frontend/qclipanimator.h index 72f1ba95f..bc77b20ff 100644 --- a/src/animation/frontend/qclipanimator.h +++ b/src/animation/frontend/qclipanimator.h @@ -51,7 +51,7 @@ class QAbstractAnimationClip; class QChannelMapper; class QClipAnimatorPrivate; -class QT3DANIMATIONSHARED_EXPORT QClipAnimator : public Qt3DAnimation::QAbstractClipAnimator +class Q_3DANIMATIONSHARED_EXPORT QClipAnimator : public Qt3DAnimation::QAbstractClipAnimator { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAbstractAnimationClip *clip READ clip WRITE setClip NOTIFY clipChanged) diff --git a/src/animation/frontend/qclipblendnodecreatedchange.h b/src/animation/frontend/qclipblendnodecreatedchange.h index 01f17d7ca..094e8128e 100644 --- a/src/animation/frontend/qclipblendnodecreatedchange.h +++ b/src/animation/frontend/qclipblendnodecreatedchange.h @@ -47,7 +47,7 @@ namespace Qt3DAnimation { class QAbstractClipBlendNode; class QClipBlendNodeCreatedChangeBasePrivate; -class QT3DANIMATIONSHARED_EXPORT QClipBlendNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase +class Q_3DANIMATIONSHARED_EXPORT QClipBlendNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase { public: explicit QClipBlendNodeCreatedChangeBase(const QAbstractClipBlendNode *node); diff --git a/src/animation/frontend/qclipblendvalue.h b/src/animation/frontend/qclipblendvalue.h index 65ac0eb6c..b97fc6e58 100644 --- a/src/animation/frontend/qclipblendvalue.h +++ b/src/animation/frontend/qclipblendvalue.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QClipBlendValuePrivate; -class QT3DANIMATIONSHARED_EXPORT QClipBlendValue : public Qt3DAnimation::QAbstractClipBlendNode +class Q_3DANIMATIONSHARED_EXPORT QClipBlendValue : public Qt3DAnimation::QAbstractClipBlendNode { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAbstractAnimationClip *clip READ clip WRITE setClip NOTIFY clipChanged) diff --git a/src/animation/frontend/qclock.h b/src/animation/frontend/qclock.h index ea0f294d2..8475f2831 100644 --- a/src/animation/frontend/qclock.h +++ b/src/animation/frontend/qclock.h @@ -46,7 +46,7 @@ namespace Qt3DAnimation { class QClockPrivate; -class QT3DANIMATIONSHARED_EXPORT QClock : public Qt3DCore::QNode +class Q_3DANIMATIONSHARED_EXPORT QClock : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(double playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged) diff --git a/src/animation/frontend/qkeyframe.h b/src/animation/frontend/qkeyframe.h index 7eabbeb17..87e2812b2 100644 --- a/src/animation/frontend/qkeyframe.h +++ b/src/animation/frontend/qkeyframe.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { -class QT3DANIMATIONSHARED_EXPORT QKeyFrame +class Q_3DANIMATIONSHARED_EXPORT QKeyFrame { public: enum InterpolationType : quint8 { diff --git a/src/animation/frontend/qkeyframeanimation.h b/src/animation/frontend/qkeyframeanimation.h index efc132cdd..0aed76cfb 100644 --- a/src/animation/frontend/qkeyframeanimation.h +++ b/src/animation/frontend/qkeyframeanimation.h @@ -50,7 +50,7 @@ namespace Qt3DAnimation { class QKeyframeAnimationPrivate; -class QT3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation +class Q_3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> framePositions READ framePositions WRITE setFramePositions NOTIFY framePositionsChanged) diff --git a/src/animation/frontend/qlerpclipblend.h b/src/animation/frontend/qlerpclipblend.h index 225b52e53..6511d1c37 100644 --- a/src/animation/frontend/qlerpclipblend.h +++ b/src/animation/frontend/qlerpclipblend.h @@ -45,7 +45,7 @@ namespace Qt3DAnimation { class QLerpClipBlendPrivate; -class QT3DANIMATIONSHARED_EXPORT QLerpClipBlend : public QAbstractClipBlendNode +class Q_3DANIMATIONSHARED_EXPORT QLerpClipBlend : public QAbstractClipBlendNode { Q_OBJECT Q_PROPERTY(Qt3DAnimation::QAbstractClipBlendNode *startClip READ startClip WRITE setStartClip NOTIFY startClipChanged) diff --git a/src/animation/frontend/qmorphinganimation.h b/src/animation/frontend/qmorphinganimation.h index 09d0054c8..1a9a60695 100644 --- a/src/animation/frontend/qmorphinganimation.h +++ b/src/animation/frontend/qmorphinganimation.h @@ -51,7 +51,7 @@ namespace Qt3DAnimation { class QMorphingAnimationPrivate; -class QT3DANIMATIONSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation +class Q_3DANIMATIONSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) diff --git a/src/animation/frontend/qmorphtarget.h b/src/animation/frontend/qmorphtarget.h index 0435924e1..ec9761c64 100644 --- a/src/animation/frontend/qmorphtarget.h +++ b/src/animation/frontend/qmorphtarget.h @@ -50,7 +50,7 @@ namespace Qt3DAnimation { class QMorphTargetPrivate; -class QT3DANIMATIONSHARED_EXPORT QMorphTarget : public QObject +class Q_3DANIMATIONSHARED_EXPORT QMorphTarget : public QObject { Q_OBJECT Q_PROPERTY(QStringList attributeNames READ attributeNames NOTIFY attributeNamesChanged) diff --git a/src/animation/frontend/qskeletonmapping.h b/src/animation/frontend/qskeletonmapping.h index 2c698da8e..275fce818 100644 --- a/src/animation/frontend/qskeletonmapping.h +++ b/src/animation/frontend/qskeletonmapping.h @@ -53,7 +53,7 @@ namespace Qt3DAnimation { class QSkeletonMappingPrivate; -class QT3DANIMATIONSHARED_EXPORT QSkeletonMapping : public QAbstractChannelMapping +class Q_3DANIMATIONSHARED_EXPORT QSkeletonMapping : public QAbstractChannelMapping { Q_OBJECT Q_PROPERTY(Qt3DCore::QAbstractSkeleton* skeleton READ skeleton WRITE setSkeleton NOTIFY skeletonChanged) diff --git a/src/animation/frontend/qvertexblendanimation.h b/src/animation/frontend/qvertexblendanimation.h index a7da2bcda..1be721ce4 100644 --- a/src/animation/frontend/qvertexblendanimation.h +++ b/src/animation/frontend/qvertexblendanimation.h @@ -49,7 +49,7 @@ namespace Qt3DAnimation { class QVertexBlendAnimationPrivate; -class QT3DANIMATIONSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimation +class Q_3DANIMATIONSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimation { Q_OBJECT Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) diff --git a/src/animation/qt3danimation_global.h b/src/animation/qt3danimation_global.h index 6b66e7ec9..b6dd15161 100644 --- a/src/animation/qt3danimation_global.h +++ b/src/animation/qt3danimation_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DANIMATION_LIB) -# define QT3DANIMATIONSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DANIMATIONSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DANIMATIONSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DANIMATIONSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DANIMATIONSHARED_EXPORT +# define Q_3DANIMATIONSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/animation/qt3danimation_global_p.h b/src/animation/qt3danimation_global_p.h index e184222b5..ce1b99b9c 100644 --- a/src/animation/qt3danimation_global_p.h +++ b/src/animation/qt3danimation_global_p.h @@ -53,7 +53,7 @@ #include "qt3danimation_global.h" -#define QT3DANIMATIONSHARED_PRIVATE_EXPORT QT3DANIMATIONSHARED_EXPORT +#define Q_3DANIMATIONSHARED_PRIVATE_EXPORT Q_3DANIMATIONSHARED_EXPORT #endif // QT3DANIMATION_GLOBAL_P_H |