diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:20:54 +0200 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-02 12:40:01 +0100 |
commit | 8dbf165620d927c2eade8c88f6c9e88214fa6a0e (patch) | |
tree | f306abfe59b5f3d7d08dba1b90302654530feaf4 /src | |
parent | d06f0a20932103f4390455ed07d262652ba9af54 (diff) |
Migrate to autogenerated cpp exports
Replace the hardcoded cpp exports with a generated one where it's
applicable.
Task-number: QTBUG-90492
Change-Id: I176a068c7064a713aea751e1b536fb748352c1cb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/timeline/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/timeline/qquickkeyframe_p.h | 4 | ||||
-rw-r--r-- | src/timeline/qquicktimeline_p.h | 2 | ||||
-rw-r--r-- | src/timeline/qquicktimelineanimation_p.h | 2 | ||||
-rw-r--r-- | src/timeline/qtquicktimelineglobal.h | 15 | ||||
-rw-r--r-- | src/timeline/qtquicktimelineglobal_p.h | 7 |
6 files changed, 8 insertions, 24 deletions
diff --git a/src/timeline/CMakeLists.txt b/src/timeline/CMakeLists.txt index 42a63ee..b748f02 100644 --- a/src/timeline/CMakeLists.txt +++ b/src/timeline/CMakeLists.txt @@ -20,6 +20,8 @@ qt_internal_add_qml_module(QuickTimeline Qt::Quick LIBRARIES Qt::QuickPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) qt_internal_add_docs(QuickTimeline diff --git a/src/timeline/qquickkeyframe_p.h b/src/timeline/qquickkeyframe_p.h index 1951294..3f263c6 100644 --- a/src/timeline/qquickkeyframe_p.h +++ b/src/timeline/qquickkeyframe_p.h @@ -54,7 +54,7 @@ class QQuickKeyframeGroupPrivate; class QQuickKeyframePrivate; class QQuickNumberKeyframePrivate; -class Q_QUICK_TIMELINE_PRIVATE_EXPORT QQuickKeyframe : public QObject +class Q_QUICKTIMELINE_PRIVATE_EXPORT QQuickKeyframe : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QQuickKeyframe) @@ -90,7 +90,7 @@ Q_SIGNALS: void valueChanged(); }; -class Q_QUICK_TIMELINE_PRIVATE_EXPORT QQuickKeyframeGroup : public QObject, public QQmlParserStatus +class Q_QUICKTIMELINE_PRIVATE_EXPORT QQuickKeyframeGroup : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickKeyframeGroup) diff --git a/src/timeline/qquicktimeline_p.h b/src/timeline/qquicktimeline_p.h index 65d08ba..b74faf7 100644 --- a/src/timeline/qquicktimeline_p.h +++ b/src/timeline/qquicktimeline_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class QQuickTimelinePrivate; -class Q_QUICK_TIMELINE_PRIVATE_EXPORT QQuickTimeline : public QObject, public QQmlParserStatus +class Q_QUICKTIMELINE_PRIVATE_EXPORT QQuickTimeline : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickTimeline) diff --git a/src/timeline/qquicktimelineanimation_p.h b/src/timeline/qquicktimelineanimation_p.h index 24ccf91..465f03d 100644 --- a/src/timeline/qquicktimelineanimation_p.h +++ b/src/timeline/qquicktimelineanimation_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_TIMELINE_PRIVATE_EXPORT QQuickTimelineAnimation : public QQuickNumberAnimation +class Q_QUICKTIMELINE_PRIVATE_EXPORT QQuickTimelineAnimation : public QQuickNumberAnimation { Q_OBJECT diff --git a/src/timeline/qtquicktimelineglobal.h b/src/timeline/qtquicktimelineglobal.h index 403d54f..5cea8e9 100644 --- a/src/timeline/qtquicktimelineglobal.h +++ b/src/timeline/qtquicktimelineglobal.h @@ -31,19 +31,6 @@ #define QTQUICKTIMELINEGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_QUICK_TIMELINE_LIB) -# define Q_QUICK_TIMELINE_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK_TIMELINE_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QUICK_TIMELINE_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtQuickTimeline/qtquicktimelineexports.h> #endif // QTQUICKTIMELINEGLOBAL_H diff --git a/src/timeline/qtquicktimelineglobal_p.h b/src/timeline/qtquicktimelineglobal_p.h index 0cf3ec2..6436e3e 100644 --- a/src/timeline/qtquicktimelineglobal_p.h +++ b/src/timeline/qtquicktimelineglobal_p.h @@ -42,11 +42,6 @@ // #include "qtquicktimelineglobal.h" - -QT_BEGIN_NAMESPACE - -#define Q_QUICK_TIMELINE_PRIVATE_EXPORT Q_QUICK_TIMELINE_EXPORT - -QT_END_NAMESPACE +#include <QtQuickTimeline/private/qtquicktimelineexports_p.h> #endif // QTQUICKTIMELINEGLOBAL_P_H |