diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:13:37 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-11-02 14:45:01 +0100 |
| commit | 5a263130aa7001439f57d891e863165c4589f40b (patch) | |
| tree | 7a7f9e8a6ec0e5f1fe27271db378d08dc469626b /src | |
| parent | 270b138a37feb11bd5d85aff5e29e388ef1098d5 (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: Ic99415bff0c24141b8d0bc3b7c9d6829439b2a46
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/charts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/charts/qchartglobal.h | 18 | ||||
| -rw-r--r-- | src/charts/qchartglobal_p.h | 3 |
3 files changed, 6 insertions, 17 deletions
diff --git a/src/charts/CMakeLists.txt b/src/charts/CMakeLists.txt index 6f61dd0e..4bf76264 100644 --- a/src/charts/CMakeLists.txt +++ b/src/charts/CMakeLists.txt @@ -113,6 +113,8 @@ qt_internal_add_module(Charts Qt::Core Qt::Gui Qt::Widgets + GENERATE_CPP_EXPORTS + GENERATE_PRIVATE_CPP_EXPORTS ) qt_internal_extend_target(Charts CONDITION QT_FEATURE_opengl diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index 4e66c907..e0f2d5d5 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -32,6 +32,9 @@ #include <QtCore/qglobal.h> #include <QtCharts/qtcharts-config.h> +#include <QtCharts/qtchartsexports.h> + +#define Q_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT #define QT_CHARTS_VERSION_STR QT_VERSION_STR /* @@ -43,21 +46,6 @@ */ #define QT_CHARTS_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_CHARTS_LIB) -# define Q_CHARTS_EXPORT Q_DECL_EXPORT -# else -# define Q_CHARTS_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_CHARTS_EXPORT -#endif - -#define Q_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT - -QT_END_NAMESPACE /* On Windows min and max conflict with standard macros */ diff --git a/src/charts/qchartglobal_p.h b/src/charts/qchartglobal_p.h index 3f8d0338..345f8a3e 100644 --- a/src/charts/qchartglobal_p.h +++ b/src/charts/qchartglobal_p.h @@ -44,7 +44,6 @@ #include <QtCharts/qchartglobal.h> #include <QtCore/private/qglobal_p.h> #include <QtCharts/private/qtcharts-config_p.h> - -#define Q_CHARTS_PRIVATE_EXPORT Q_CHARTS_EXPORT +#include <QtCharts/private/qtchartsexports_p.h> #endif // QCHARTGLOBAL_P_H |