diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-29 15:27:51 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-02 16:32:25 +0100 |
| commit | 250d6269e9f60021d88a574d04941ab342afb632 (patch) | |
| tree | b2630f309c5e94384b739e15d8c6a69e2e137101 /src/qmlworkerscript | |
| parent | 6b4d3613326b38bc05c813c449b31affd9c3795a (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: I4af021bf828e05c8d6f3f975befd3b6b2cf63462
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmlworkerscript/qtqmlworkerscriptglobal.h | 14 | ||||
| -rw-r--r-- | src/qmlworkerscript/qtqmlworkerscriptglobal_p.h | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 3525107cfe..bb00e88f12 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -48,6 +48,8 @@ qt_internal_add_qml_module(QmlWorkerScript PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::QmlPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) qt_internal_extend_target(QmlWorkerScript CONDITION WIN32 diff --git a/src/qmlworkerscript/qtqmlworkerscriptglobal.h b/src/qmlworkerscript/qtqmlworkerscriptglobal.h index be3ea4e12a..87ee6b32a5 100644 --- a/src/qmlworkerscript/qtqmlworkerscriptglobal.h +++ b/src/qmlworkerscript/qtqmlworkerscriptglobal.h @@ -41,18 +41,6 @@ #define QTQMLWORKERSCRIPTGLOBAL_H #include <QtQml/qtqmlglobal.h> +#include <QtQmlWorkerScript/qtqmlworkerscriptexports.h> -QT_BEGIN_NAMESPACE - -#if !defined(QT_STATIC) -# if defined(QT_BUILD_QMLWORKERSCRIPT_LIB) -# define Q_QMLWORKERSCRIPT_EXPORT Q_DECL_EXPORT -# else -# define Q_QMLWORKERSCRIPT_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QMLWORKERSCRIPT_EXPORT -#endif - -QT_END_NAMESPACE #endif // QTQMLWORKERSCRIPTGLOBAL_H diff --git a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h index 34236cd79e..aa754f7c9e 100644 --- a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h +++ b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h @@ -53,8 +53,8 @@ #include <QtQml/private/qtqmlglobal_p.h> #include <QtQmlWorkerScript/qtqmlworkerscriptglobal.h> +#include <QtQmlWorkerScript/private/qtqmlworkerscriptexports_p.h> -#define Q_QMLWORKERSCRIPT_PRIVATE_EXPORT Q_QMLWORKERSCRIPT_EXPORT #define Q_QMLWORKERSCRIPT_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT #endif // QTQMLWORKERSCRIPTGLOBAL_P_H |