diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2016-05-20 06:27:39 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2016-05-23 05:01:08 +0000 |
| commit | f7faf946d5f05052712dfcf554d2d839432ed561 (patch) | |
| tree | 5becb1e3d68423be91350dfed71e1d07da370341 /src | |
| parent | 1217b9d8bd66ff504e8c213e35209dcb6c979d92 (diff) | |
Use standardized module export macros
Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 4 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 21 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index a32f1591..21bd83ab 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -8,10 +8,6 @@ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { QT += core gui osx: QT += gui-private -DEFINES += QT_DATAVISUALIZATION_LIBRARY - -# Fix exports in static builds for applications linking datavisualization module -static: MODULE_DEFINES += QT_DATAVISUALIZATION_STATICLIB MODULE_INCNAME = QtDataVisualization diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 3eec54b4..cda15d0c 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -34,27 +34,24 @@ */ #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if defined(QT_DATAVISUALIZATION_LIBRARY) -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_DATAVISUALIZATION_LIB) +# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT +# else +# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT +# endif #else -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT +# define QT_DATAVISUALIZATION_EXPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVISUALIZATION_LIBRARY) +#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_DATAVISUALIZATION_LIB) # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVISUALIZATION_LIBRARY) +#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_DATAVISUALIZATION_LIB) # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_IMPORT #else # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT #endif -#ifdef QT_DATAVISUALIZATION_STATICLIB -# undef QT_DATAVISUALIZATION_EXPORT -# undef QT_DATAVISUALIZATION_AUTOTEST_EXPORT -# define QT_DATAVISUALIZATION_EXPORT -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT -#endif - #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_END_NAMESPACE_DATAVISUALIZATION } |