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/quickshapes | |
| 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/quickshapes')
| -rw-r--r-- | src/quickshapes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickshapes/qquickshapesglobal.h | 15 | ||||
| -rw-r--r-- | src/quickshapes/qquickshapesglobal_p.h | 7 |
3 files changed, 4 insertions, 20 deletions
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index ed219d8728..3cf5285d57 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -23,6 +23,8 @@ qt_internal_add_qml_module(QuickShapesPrivate Qt::GuiPrivate Qt::Qml Qt::QuickPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) # We need to do additional initialization, so we have to provide our own diff --git a/src/quickshapes/qquickshapesglobal.h b/src/quickshapes/qquickshapesglobal.h index eb279c5d14..3d73c8c8ef 100644 --- a/src/quickshapes/qquickshapesglobal.h +++ b/src/quickshapes/qquickshapesglobal.h @@ -37,20 +37,7 @@ #define QQUICKSHAPESGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_QUICKSHAPES_LIB) -# define Q_QUICKSHAPES_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICKSHAPES_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QUICKSHAPES_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtQuickShapes/qtquickshapesexports.h> #endif // QQUICKSHAPESGLOBAL_H diff --git a/src/quickshapes/qquickshapesglobal_p.h b/src/quickshapes/qquickshapesglobal_p.h index 40f6cfbdcf..ba9ee1486f 100644 --- a/src/quickshapes/qquickshapesglobal_p.h +++ b/src/quickshapes/qquickshapesglobal_p.h @@ -52,12 +52,7 @@ // #include "qquickshapesglobal.h" - -QT_BEGIN_NAMESPACE - -#define Q_QUICKSHAPES_PRIVATE_EXPORT Q_QUICKSHAPES_EXPORT - -QT_END_NAMESPACE +#include <QtQuickShapes/private/qtquickshapesexports_p.h> void Q_QUICKSHAPES_PRIVATE_EXPORT qml_register_types_QtQuick_Shapes(); |