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/logic | |
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/logic')
-rw-r--r-- | src/logic/qframeaction.h | 2 | ||||
-rw-r--r-- | src/logic/qlogicaspect.h | 2 | ||||
-rw-r--r-- | src/logic/qt3dlogic_global.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/logic/qframeaction.h b/src/logic/qframeaction.h index f67bb9631..35cbf1883 100644 --- a/src/logic/qframeaction.h +++ b/src/logic/qframeaction.h @@ -54,7 +54,7 @@ namespace Logic { class Executor; } -class QT3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent +class Q_3DLOGICSHARED_EXPORT QFrameAction : public Qt3DCore::QComponent { Q_OBJECT diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h index 958c0ce82..a44073ed0 100644 --- a/src/logic/qlogicaspect.h +++ b/src/logic/qlogicaspect.h @@ -49,7 +49,7 @@ namespace Qt3DLogic { class QLogicAspectPrivate; -class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect +class Q_3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: diff --git a/src/logic/qt3dlogic_global.h b/src/logic/qt3dlogic_global.h index 1e6610058..e11bae7af 100644 --- a/src/logic/qt3dlogic_global.h +++ b/src/logic/qt3dlogic_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DLOGIC_LIB) -# define QT3DLOGICSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DLOGICSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DLOGICSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DLOGICSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DLOGICSHARED_EXPORT +# define Q_3DLOGICSHARED_EXPORT #endif QT_END_NAMESPACE |