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/qml | |
| 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/qml')
| -rw-r--r-- | src/qml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal.h | 13 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal_p.h | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 08f7d52ab5..879436ac7a 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -395,6 +395,8 @@ qt_internal_add_qml_module(Qml EXTRA_CMAKE_INCLUDES "${INSTALL_CMAKE_NAMESPACE}QmlFindQmlscInternal.cmake" ${extra_cmake_includes} + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) # Linking to the static qml plugin should also automatically link to the worker script diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 387eba6231..0651355c67 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -47,17 +47,6 @@ # include <QtNetwork/qtnetworkglobal.h> #endif -QT_BEGIN_NAMESPACE +# include <QtQml/qtqmlexports.h> -#if !defined(QT_STATIC) -# if defined(QT_BUILD_QML_LIB) -# define Q_QML_EXPORT Q_DECL_EXPORT -# else -# define Q_QML_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QML_EXPORT -#endif - -QT_END_NAMESPACE #endif // QTQMLGLOBAL_H diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h index 02f4f54119..c59e79257b 100644 --- a/src/qml/qtqmlglobal_p.h +++ b/src/qml/qtqmlglobal_p.h @@ -54,8 +54,8 @@ #include <QtCore/private/qglobal_p.h> #include <QtQml/qtqmlglobal.h> #include <QtQml/private/qtqml-config_p.h> +#include <QtQml/private/qtqmlexports_p.h> -#define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT #define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT #endif // QTQMLGLOBAL_P_H |