diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:27:28 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-02 12:42:39 +0100 |
| commit | 0412617ba78cbe63e7d4b3c6af0b365891d6dd59 (patch) | |
| tree | c39cf4db381a6e8e49c97130a6c424a9d2a518f9 /src | |
| parent | 1ce943e99bdc1821fd6e1c0b8262f389c606d2eb (diff) | |
| download | qtsvg-0412617ba78cbe63e7d4b3c6af0b365891d6dd59.tar.gz | |
Migrate to autogenerated cpp exports
Replace the hardcoded cpp exports with a generated one where it's
applicable.
Task-number: QTBUG-90492
Change-Id: I51752fe30d5e0a25ae8725ac29ffe1d4bf193ece
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/svg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/svg/qtsvgglobal.h | 17 | ||||
| -rw-r--r-- | src/svg/qtsvgglobal_p.h | 3 | ||||
| -rw-r--r-- | src/svgwidgets/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/svgwidgets/qtsvgwidgetsglobal.h | 17 |
5 files changed, 6 insertions, 34 deletions
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index 422eb3e..a4db276 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -36,6 +36,8 @@ qt_internal_add_module(Svg PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) ## Scopes: diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h index 92075c9..e2bbac5 100644 --- a/src/svg/qtsvgglobal.h +++ b/src/svg/qtsvgglobal.h @@ -41,21 +41,6 @@ #define QTSVGGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef Q_SVG_EXPORT -# ifndef QT_STATIC -# if defined(QT_BUILD_SVG_LIB) -# define Q_SVG_EXPORT Q_DECL_EXPORT -# else -# define Q_SVG_EXPORT Q_DECL_IMPORT -# endif -# else -# define Q_SVG_EXPORT -# endif -#endif - -QT_END_NAMESPACE +#include <QtSvg/qtsvgexports.h> #endif diff --git a/src/svg/qtsvgglobal_p.h b/src/svg/qtsvgglobal_p.h index ff93a36..0ac195b 100644 --- a/src/svg/qtsvgglobal_p.h +++ b/src/svg/qtsvgglobal_p.h @@ -52,7 +52,6 @@ // #include "qtsvgglobal.h" - -#define Q_SVG_PRIVATE_EXPORT Q_SVG_EXPORT +#include <QtSvg/private/qtsvgexports_p.h> #endif // QTSVGGLOBAL_P_H diff --git a/src/svgwidgets/CMakeLists.txt b/src/svgwidgets/CMakeLists.txt index cb11bf0..d9b4036 100644 --- a/src/svgwidgets/CMakeLists.txt +++ b/src/svgwidgets/CMakeLists.txt @@ -23,6 +23,7 @@ qt_internal_add_module(SvgWidgets Qt::CorePrivate Qt::GuiPrivate Qt::WidgetsPrivate + GENERATE_CPP_EXPORTS ) qt_internal_extend_target(SvgWidgets CONDITION QT_FEATURE_graphicsview diff --git a/src/svgwidgets/qtsvgwidgetsglobal.h b/src/svgwidgets/qtsvgwidgetsglobal.h index 9802247..a95ed2c 100644 --- a/src/svgwidgets/qtsvgwidgetsglobal.h +++ b/src/svgwidgets/qtsvgwidgetsglobal.h @@ -41,21 +41,6 @@ #define QTSVGWIDGETSGLOBAL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef Q_SVGWIDGETS_EXPORT -# ifndef QT_STATIC -# if defined(QT_BUILD_SVGWIDGETS_LIB) -# define Q_SVGWIDGETS_EXPORT Q_DECL_EXPORT -# else -# define Q_SVGWIDGETS_EXPORT Q_DECL_IMPORT -# endif -# else -# define Q_SVGWIDGETS_EXPORT -# endif -#endif - -QT_END_NAMESPACE +#include <QtSvgWidgets/qtsvgwidgetsexports.h> #endif |