diff options
Diffstat (limited to 'src/quick3d')
64 files changed, 96 insertions, 96 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentity_p.h b/src/quick3d/quick3d/items/quick3dentity_p.h index 7ba5c62c2..fe895f3ec 100644 --- a/src/quick3d/quick3d/items/quick3dentity_p.h +++ b/src/quick3d/quick3d/items/quick3dentity_p.h @@ -66,7 +66,7 @@ class QComponent; namespace Quick { -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntity : public QObject +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntity : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QComponent> components READ componentList) diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index 611d86cb2..9d3a70147 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -70,7 +70,7 @@ namespace Quick { class Quick3DEntityLoaderPrivate; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity { Q_OBJECT Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged) diff --git a/src/quick3d/quick3d/items/quick3djoint_p.h b/src/quick3d/quick3d/items/quick3djoint_p.h index bef161643..d66419433 100644 --- a/src/quick3d/quick3d/items/quick3djoint_p.h +++ b/src/quick3d/quick3d/items/quick3djoint_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DJoint : public QObject +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DJoint : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QJoint> childJoints READ childJoints) diff --git a/src/quick3d/quick3d/items/quick3dnode_p.h b/src/quick3d/quick3d/items/quick3dnode_p.h index 640a58149..6b146d691 100644 --- a/src/quick3d/quick3d/items/quick3dnode_p.h +++ b/src/quick3d/quick3d/items/quick3dnode_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNode : public QObject +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DNode : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> data READ data) diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h index b92c98133..ac888e0cb 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h @@ -65,7 +65,7 @@ namespace Quick { class Quick3DNodeInstantiatorPrivate; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeInstantiator : public QNode, public QQmlParserStatus +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeInstantiator : public QNode, public QQmlParserStatus { Q_OBJECT diff --git a/src/quick3d/quick3d/items/quick3dnodev9_p.h b/src/quick3d/quick3d/items/quick3dnodev9_p.h index d969c4b64..a088e72e6 100644 --- a/src/quick3d/quick3d/items/quick3dnodev9_p.h +++ b/src/quick3d/quick3d/items/quick3dnodev9_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeV9 : public QObject +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeV9 : public QObject { Q_OBJECT Q_PROPERTY(QJSValue propertyTrackingOverrides READ propertyTrackingOverrides WRITE setPropertyTrackingOverrides NOTIFY propertyTrackingOverridesChanged) diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index a7b09ec8a..1b3922212 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -51,7 +51,7 @@ namespace Quick { class QQmlAspectEnginePrivate; -class QT3DQUICKSHARED_EXPORT QQmlAspectEngine: public QObject +class Q_3DQUICKSHARED_EXPORT QQmlAspectEngine: public QObject { Q_OBJECT public: diff --git a/src/quick3d/quick3d/qquaternionanimation_p.h b/src/quick3d/quick3d/qquaternionanimation_p.h index 172d3bc85..7fb49f670 100644 --- a/src/quick3d/quick3d/qquaternionanimation_p.h +++ b/src/quick3d/quick3d/qquaternionanimation_p.h @@ -63,7 +63,7 @@ namespace Quick { class QQuaternionAnimationPrivate; -class QT3DQUICKSHARED_PRIVATE_EXPORT QQuaternionAnimation : public QQuickPropertyAnimation +class Q_3DQUICKSHARED_PRIVATE_EXPORT QQuaternionAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuaternionAnimation) @@ -125,7 +125,7 @@ Q_SIGNALS: void toZRotationChanged(float value); }; -QT3DQUICKSHARED_PRIVATE_EXPORT QVariant q_quaternionInterpolator(const QQuaternion &from, const QQuaternion &to, qreal progress); +Q_3DQUICKSHARED_PRIVATE_EXPORT QVariant q_quaternionInterpolator(const QQuaternion &from, const QQuaternion &to, qreal progress); } // namespace Quick } // namespace Qt3DCore diff --git a/src/quick3d/quick3d/qt3dquick_global.h b/src/quick3d/quick3d/qt3dquick_global.h index b2f580335..ae79a6fb6 100644 --- a/src/quick3d/quick3d/qt3dquick_global.h +++ b/src/quick3d/quick3d/qt3dquick_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICK_LIB) -# define QT3DQUICKSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKSHARED_EXPORT +# define Q_3DQUICKSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h index ffc603f91..87fd4764c 100644 --- a/src/quick3d/quick3d/qt3dquick_global_p.h +++ b/src/quick3d/quick3d/qt3dquick_global_p.h @@ -54,16 +54,16 @@ #include <Qt3DQuick/qt3dquick_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKSHARED_EXPORT +#define Q_3DQUICKSHARED_PRIVATE_EXPORT Q_3DQUICKSHARED_EXPORT QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize(); -QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_uninitialize(); -QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_registerType(const char *className, const char *quickName, int major, int minor); +Q_3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize(); +Q_3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_uninitialize(); +Q_3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_registerType(const char *className, const char *quickName, int major, int minor); template<class T, class E> void registerExtendedType(const char *className, const char *quickName, const char *uri, int major, int minor, const char *name) diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index 46500b935..9f21f9146 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -68,11 +68,11 @@ namespace Qt3DCore { namespace Quick { namespace Quick3DValueTypes { -QT3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes(); +Q_3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes(); } -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DColorValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DColorValueType { QColor v; Q_PROPERTY(qreal r READ r WRITE setR FINAL) @@ -93,7 +93,7 @@ public: void setA(qreal); }; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector2DValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector2DValueType { QVector2D v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -120,7 +120,7 @@ public: Q_INVOKABLE bool fuzzyEquals(const QVector2D &vec) const; }; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector3DValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector3DValueType { QVector3D v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -152,7 +152,7 @@ public: Q_INVOKABLE bool fuzzyEquals(const QVector3D &vec) const; }; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector4DValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DVector4DValueType { QVector4D v; Q_PROPERTY(qreal x READ x WRITE setX FINAL) @@ -186,7 +186,7 @@ public: Q_INVOKABLE bool fuzzyEquals(const QVector4D &vec) const; }; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DQuaternionValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DQuaternionValueType { QQuaternion v; Q_PROPERTY(qreal scalar READ scalar WRITE setScalar) @@ -207,7 +207,7 @@ public: void setZ(qreal); }; -class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DMatrix4x4ValueType +class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DMatrix4x4ValueType { QMatrix4x4 v; Q_PROPERTY(qreal m11 READ m11 WRITE setM11 FINAL) diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h index a3033e537..d6add010d 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationController : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationController : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAnimationGroup> animationGroups READ animationGroups) diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h index aef202480..53b25cf67 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h +++ b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationGroup : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DAnimationGroup : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAbstractAnimation> animations READ animations) diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h index c3ec577a2..a21a67411 100644 --- a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h +++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h @@ -62,7 +62,7 @@ namespace Qt3DAnimation { namespace Animation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Quick3DChannelMapper : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Quick3DChannelMapper : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QAbstractChannelMapping> mappings READ qmlMappings CONSTANT) diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h index 944cdbe67..b4eda766c 100644 --- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h +++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DKeyframeAnimation : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DKeyframeAnimation : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QTransform> keyframes READ keyframes) diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h index 31d008a89..3ba018473 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h +++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphingAnimation : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphingAnimation : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QMorphTarget> morphTargets READ morphTargets) diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h index 03b52dfeb..5ca783e6b 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h +++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphTarget : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DMorphTarget : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributes) diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h index 6be2d662f..f33730fb5 100644 --- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h +++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -class QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DVertexBlendAnimation : public QObject +class Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QQuick3DVertexBlendAnimation : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DAnimation::QMorphTarget> morphTargets READ morphTargets) diff --git a/src/quick3d/quick3danimation/qt3dquickanimation_global.h b/src/quick3d/quick3danimation/qt3dquickanimation_global.h index 962321b2f..51b38dd96 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimation_global.h +++ b/src/quick3d/quick3danimation/qt3dquickanimation_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICKANIMATION_LIB) -# define QT3DQUICKANIMATIONSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKANIMATIONSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKANIMATIONSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKANIMATIONSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKANIMATIONSHARED_EXPORT +# define Q_3DQUICKANIMATIONSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h b/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h index 89d755931..c57cd55ea 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h +++ b/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h @@ -54,15 +54,15 @@ #include <Qt3DQuickAnimation/qt3dquickanimation_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT QT3DQUICKANIMATIONSHARED_EXPORT +#define Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Q_3DQUICKANIMATIONSHARED_EXPORT QT_BEGIN_NAMESPACE namespace Qt3DAnimation { namespace Quick { -QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT void Quick3DAnimation_initialize(); -QT3DQUICKANIMATIONSHARED_PRIVATE_EXPORT void Quick3DAnimation_registerType(const char *className, const char *quickName, int major, int minor); +Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT void Quick3DAnimation_initialize(); +Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT void Quick3DAnimation_registerType(const char *className, const char *quickName, int major, int minor); template<class T, class E> void registerExtendedType(const char *className, const char *quickName, const char *uri, int major, int minor, const char *name) diff --git a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h index 445e7bca6..adc756e96 100644 --- a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h +++ b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h @@ -63,7 +63,7 @@ namespace Quick { class Quick3DLevelOfDetailLoaderPrivate; -class QT3DQUICKEXTRASSHARED_PRIVATE_EXPORT Quick3DLevelOfDetailLoader : public Qt3DCore::QEntity +class Q_3DQUICKEXTRASSHARED_PRIVATE_EXPORT Quick3DLevelOfDetailLoader : public Qt3DCore::QEntity { Q_OBJECT Q_PROPERTY(QVariantList sources READ sources WRITE setSources NOTIFY sourcesChanged) diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h index 38a92dd2a..82409b755 100644 --- a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h +++ b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h @@ -61,7 +61,7 @@ namespace Qt3DExtras { namespace Extras { namespace Quick { -class QT3DQUICKEXTRASSHARED_EXPORT Quick3DSpriteSheet : public QObject +class Q_3DQUICKEXTRASSHARED_EXPORT Quick3DSpriteSheet : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DExtras::QSpriteSheetItem> sprites READ sprites CONSTANT) diff --git a/src/quick3d/quick3dextras/qt3dquickextras_global.h b/src/quick3d/quick3dextras/qt3dquickextras_global.h index d9277baee..8f589378e 100644 --- a/src/quick3d/quick3dextras/qt3dquickextras_global.h +++ b/src/quick3d/quick3dextras/qt3dquickextras_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICKEXTRAS_LIB) -# define QT3DQUICKEXTRASSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKEXTRASSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKEXTRASSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKEXTRASSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKEXTRASSHARED_EXPORT +# define Q_3DQUICKEXTRASSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3dextras/qt3dquickextras_global_p.h b/src/quick3d/quick3dextras/qt3dquickextras_global_p.h index a27533517..40c8d8a10 100644 --- a/src/quick3d/quick3dextras/qt3dquickextras_global_p.h +++ b/src/quick3d/quick3dextras/qt3dquickextras_global_p.h @@ -54,15 +54,15 @@ #include <Qt3DQuickExtras/qt3dquickextras_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKEXTRASSHARED_PRIVATE_EXPORT QT3DQUICKEXTRASSHARED_EXPORT +#define Q_3DQUICKEXTRASSHARED_PRIVATE_EXPORT Q_3DQUICKEXTRASSHARED_EXPORT QT_BEGIN_NAMESPACE namespace Qt3DExtras { namespace Quick { -QT3DQUICKEXTRASSHARED_PRIVATE_EXPORT void Quick3DExtras_initialize(); -QT3DQUICKEXTRASSHARED_PRIVATE_EXPORT void Quick3DExtras_registerType(const char *className, const char *quickName, int major, int minor); +Q_3DQUICKEXTRASSHARED_PRIVATE_EXPORT void Quick3DExtras_initialize(); +Q_3DQUICKEXTRASSHARED_PRIVATE_EXPORT void Quick3DExtras_registerType(const char *className, const char *quickName, int major, int minor); template<class T, class E> void registerExtendedType(const char *className, const char *quickName, const char *uri, int major, int minor, const char *name) diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index 30f901979..2d0717651 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -86,7 +86,7 @@ namespace Quick { class Qt3DQuickWindowPrivate; -class QT3DQUICKEXTRASSHARED_EXPORT Qt3DQuickWindow : public QWindow +class Q_3DQUICKEXTRASSHARED_EXPORT Qt3DQuickWindow : public QWindow { Q_OBJECT Q_PROPERTY(CameraAspectRatioMode cameraAspectRatioMode READ cameraAspectRatioMode WRITE setCameraAspectRatioMode NOTIFY cameraAspectRatioModeChanged) diff --git a/src/quick3d/quick3dinput/items/quick3daction_p.h b/src/quick3d/quick3dinput/items/quick3daction_p.h index 86e52eb33..8fb91ed40 100644 --- a/src/quick3d/quick3dinput/items/quick3daction_p.h +++ b/src/quick3d/quick3dinput/items/quick3daction_p.h @@ -63,7 +63,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAction : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAction : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> inputs READ qmlActionInputs CONSTANT) diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h index 58ba32ae7..631139212 100644 --- a/src/quick3d/quick3dinput/items/quick3daxis_p.h +++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h @@ -63,7 +63,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAxis : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DAxis : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractAxisInput> inputs READ qmlAxisInputs CONSTANT) diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h index 3380fefa4..5bfd15b09 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h +++ b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h @@ -62,7 +62,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputChord : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputChord : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> chords READ qmlActionInputs CONSTANT) diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h index aea671f12..54e40ec42 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h +++ b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h @@ -62,7 +62,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputSequence : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DInputSequence : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAbstractActionInput> sequences READ qmlActionInputs CONSTANT) diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h index 050d81ab8..e544bbc14 100644 --- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h +++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h @@ -64,7 +64,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DLogicalDevice : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DLogicalDevice : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAxis> axes READ qmlAxes CONSTANT) diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h index b4c96ac14..0c0940952 100644 --- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h +++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h @@ -64,7 +64,7 @@ namespace Qt3DInput { namespace Input { namespace Quick { -class QT3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DPhysicalDevice : public QObject +class Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Quick3DPhysicalDevice : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DInput::QAxisSetting> axisSettings READ axisSettings CONSTANT) diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global.h b/src/quick3d/quick3dinput/qt3dquickinput_global.h index d34667dc3..2a5b5f1e5 100644 --- a/src/quick3d/quick3dinput/qt3dquickinput_global.h +++ b/src/quick3d/quick3dinput/qt3dquickinput_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICKINPUT_LIB) -# define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKINPUTSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKINPUTSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKINPUTSHARED_EXPORT +# define Q_3DQUICKINPUTSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global_p.h b/src/quick3d/quick3dinput/qt3dquickinput_global_p.h index a5d9adcec..0924fcb62 100644 --- a/src/quick3d/quick3dinput/qt3dquickinput_global_p.h +++ b/src/quick3d/quick3dinput/qt3dquickinput_global_p.h @@ -54,7 +54,7 @@ #include <Qt3DQuickInput/qt3dquickinput_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKINPUTSHARED_PRIVATE_EXPORT QT3DQUICKINPUTSHARED_EXPORT +#define Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Q_3DQUICKINPUTSHARED_EXPORT QT_BEGIN_NAMESPACE @@ -62,8 +62,8 @@ namespace Qt3DInput { namespace Quick { -QT3DQUICKINPUTSHARED_PRIVATE_EXPORT void Quick3DInput_initialize(); -QT3DQUICKINPUTSHARED_PRIVATE_EXPORT void Quick3DInput_registerType(const char *className, const char *quickName, int major, int minor); +Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT void Quick3DInput_initialize(); +Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT void Quick3DInput_registerType(const char *className, const char *quickName, int major, int minor); template<class T, class E> void registerExtendedType(const char *className, const char *quickName, const char *uri, int major, int minor, const char *name) diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h index 712e11078..233cc3faf 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h +++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h @@ -70,7 +70,7 @@ namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DRender::QBuffer +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DRender::QBuffer { Q_OBJECT Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged) diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h index 3b778563d..69c5b2be6 100644 --- a/src/quick3d/quick3drender/items/quick3deffect_p.h +++ b/src/quick3d/quick3drender/items/quick3deffect_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DEffect : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DEffect : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList) diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h index 6bf7faf58..19a308076 100644 --- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h +++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributeList) diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h index f59be2787..6294d2b98 100644 --- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DLayerFilter : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DLayerFilter : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QLayer> layers READ qmlLayers) diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h index 646e3b154..2069ba9c6 100644 --- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h +++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h @@ -66,7 +66,7 @@ namespace Quick { // FIXME - write a custom QML parser and stop mis-using Tag // Tags could be replaced by Parameters directly -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMaterial : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMaterial : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters) diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h index ab8f72a76..2bbe8f34e 100644 --- a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h +++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h @@ -62,7 +62,7 @@ namespace Quick { // Qt6: Handle QFlags as Q_PROPERTY in QML -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject { Q_OBJECT Q_PROPERTY(int waitFor READ waitFor WRITE setWaitFor) diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h index 948df22a7..939cfaab8 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter_p.h +++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h @@ -63,7 +63,7 @@ namespace Quick { class Quick3DParameterPrivate; -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DParameter : public QParameter +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DParameter : public QParameter { Q_OBJECT public: diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p.h index 9be11f534..31778dc3b 100644 --- a/src/quick3d/quick3drender/items/quick3draycaster_p.h +++ b/src/quick3d/quick3drender/items/quick3draycaster_p.h @@ -66,7 +66,7 @@ namespace Quick { class Quick3DRayCasterPrivate; -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCaster : public QRayCaster +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCaster : public QRayCaster { Q_OBJECT Q_PROPERTY(QJSValue hits READ hits NOTIFY hitsChanged) diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h index 0098634bc..ef875eb43 100644 --- a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h +++ b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCasterPrivate : public QAbstractRayCasterPrivate +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCasterPrivate : public QAbstractRayCasterPrivate { public: explicit Quick3DRayCasterPrivate() : QAbstractRayCasterPrivate() { } diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h index c9d2fce59..982cab9f4 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList) diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h index cab75f4a6..8f81766ef 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h @@ -64,7 +64,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAny READ includeList) diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h index 7626a2db7..f7b15b0cb 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h +++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetOutput : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetOutput : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderTargetOutput> attachments READ qmlAttachments) diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h index 610ea1a49..7f4b99749 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h +++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h @@ -64,7 +64,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject { Q_OBJECT Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged) diff --git a/src/quick3d/quick3drender/items/quick3dscene_p.h b/src/quick3d/quick3drender/items/quick3dscene_p.h index a7173a6c7..6b7448090 100644 --- a/src/quick3d/quick3drender/items/quick3dscene_p.h +++ b/src/quick3d/quick3drender/items/quick3dscene_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject { Q_OBJECT public: diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h index b337163c5..63d3f0428 100644 --- a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h +++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h @@ -66,7 +66,7 @@ namespace Quick { class Quick3DScreenRayCasterPrivate; -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCaster : public QScreenRayCaster +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCaster : public QScreenRayCaster { Q_OBJECT Q_PROPERTY(QJSValue hits READ hits NOTIFY hitsChanged) diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h index 5c58e5087..ad5d0b941 100644 --- a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h +++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h @@ -66,7 +66,7 @@ namespace Quick { class Quick3DScreenRayCaster; -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCasterPrivate : public QAbstractRayCasterPrivate +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCasterPrivate : public QAbstractRayCasterPrivate { public: explicit Quick3DScreenRayCasterPrivate() : QAbstractRayCasterPrivate() { } diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h index 207096149..481f44446 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderData +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderData { Q_OBJECT public: diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h index 162f402aa..86d11d13c 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h @@ -69,7 +69,7 @@ namespace Quick { class Quick3DShaderDataArrayPrivate; class Quick3DShaderData; -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList) diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h index b2e63c066..7b532ec83 100644 --- a/src/quick3d/quick3drender/items/quick3dstateset_p.h +++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DStateSet : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DStateSet : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT) diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h index 9cdfdfefe..0c02e07c3 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList) diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h index 2b10bc108..9cd776827 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h @@ -64,7 +64,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAll READ matchList) diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h index 6b0430211..54d23a16b 100644 --- a/src/quick3d/quick3drender/items/quick3dtexture_p.h +++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTextureExtension : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTextureExtension : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages) diff --git a/src/quick3d/quick3drender/items/quick3dviewport_p.h b/src/quick3d/quick3drender/items/quick3dviewport_p.h index adf0c983f..8a61b490b 100644 --- a/src/quick3d/quick3drender/items/quick3dviewport_p.h +++ b/src/quick3d/quick3drender/items/quick3dviewport_p.h @@ -64,7 +64,7 @@ namespace Quick { // TO DO : Check if this is required or if this might as well be removed -class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DViewport : public QObject +class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DViewport : public QObject { Q_OBJECT public: diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h index 7c21243e3..d8900265c 100644 --- a/src/quick3d/quick3drender/qt3dquickrender_global.h +++ b/src/quick3d/quick3drender/qt3dquickrender_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICKRENDER_LIB) -# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKRENDERSHARED_EXPORT +# define Q_3DQUICKRENDERSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3drender/qt3dquickrender_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h index 77378f41b..11a4f2ff1 100644 --- a/src/quick3d/quick3drender/qt3dquickrender_global_p.h +++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h @@ -55,7 +55,7 @@ #include <Qt3DQuickRender/qt3dquickrender_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKRENDERSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT +#define Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Q_3DQUICKRENDERSHARED_EXPORT QT_BEGIN_NAMESPACE @@ -63,8 +63,8 @@ namespace Qt3DRender { namespace Quick { -QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_initialize(); -QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor); +Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_initialize(); +Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor); template<class T, class E> void registerExtendedType(const char *className, const char *quickName, const char *uri, int major, int minor, const char *name) diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index c309fc831..eab900ca4 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -60,7 +60,7 @@ namespace Quick { class QScene2DPrivate; -class QT3DQUICKSCENE2DSHARED_EXPORT QScene2D : public Qt3DCore::QNode +class Q_3DQUICKSCENE2DSHARED_EXPORT QScene2D : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h index 57734223b..fe4dd157c 100644 --- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { namespace Render { namespace Quick { -class QT3DQUICKSCENE2DSHARED_EXPORT QQuick3DScene2D : public QObject +class Q_3DQUICKSCENE2DSHARED_EXPORT QQuick3DScene2D : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<Qt3DCore::QEntity> entities READ entities) diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h index b8999887a..bd7874cd6 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h @@ -81,7 +81,7 @@ private: Scene2D *m_node; }; -class QT3DQUICKSCENE2DSHARED_EXPORT Scene2D : public Qt3DRender::Render::BackendNode +class Q_3DQUICKSCENE2DSHARED_EXPORT Scene2D : public Qt3DRender::Render::BackendNode { public: Scene2D(); diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h index 416a2280d..8de92c574 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h @@ -70,7 +70,7 @@ namespace Quick { class Scene2DManager; -class QT3DQUICKSCENE2DSHARED_EXPORT Scene2DSharedObject +class Q_3DQUICKSCENE2DSHARED_EXPORT Scene2DSharedObject { public: Scene2DSharedObject(Scene2DManager *manager); diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global.h b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global.h index 509a62024..ac2f34d0d 100644 --- a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global.h +++ b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global.h @@ -43,12 +43,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DQUICKSCENE2D_LIB) -# define QT3DQUICKSCENE2DSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DQUICKSCENE2DSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DQUICKSCENE2DSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DQUICKSCENE2DSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DQUICKSCENE2DSHARED_EXPORT +# define Q_3DQUICKSCENE2DSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h index e115e3d5e..7b68e002c 100644 --- a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h +++ b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h @@ -51,7 +51,7 @@ #include <Qt3DQuickScene2D/qt3dquickscene2d_global.h> #include <QtQml/qqml.h> -#define QT3DQUICKSCENE2DSHARED_PRIVATE_EXPORT QT3DQUICKSCENE2DSHARED_EXPORT +#define Q_3DQUICKSCENE2DSHARED_PRIVATE_EXPORT Q_3DQUICKSCENE2DSHARED_EXPORT QT_BEGIN_NAMESPACE @@ -59,8 +59,8 @@ namespace Qt3DRender { namespace Quick { -QT3DQUICKSCENE2DSHARED_PRIVATE_EXPORT void Quick3DScene2D_initialize(); -QT3DQUICKSCENE2DSHARED_PRIVATE_EXPORT void Quick3DScene2D_registerType(const char *className, +Q_3DQUICKSCENE2DSHARED_PRIVATE_EXPORT void Quick3DScene2D_initialize(); +Q_3DQUICKSCENE2DSHARED_PRIVATE_EXPORT void Quick3DScene2D_registerType(const char *className, const char *quickName, int major, int minor); |