diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:16:51 +0200 |
| commit | 2523056490c3f7a35d176deb583ba46899fe260b (patch) | |
| tree | 0a38f955248b467227e4fca5aa6e161472cec2b2 /src/datavisualization/global/qdatavisualizationglobal.h | |
| parent | 1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 (diff) | |
| parent | 4d4a9609fab58da304e4c13b9a37531116a4fadb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Conflicts:
src/datavisualization/datavisualization.pro
Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
Diffstat (limited to 'src/datavisualization/global/qdatavisualizationglobal.h')
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index da80d908..a1c31a93 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -42,25 +42,14 @@ */ #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 -#endif - -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVISUALIZATION_LIBRARY) -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVISUALIZATION_LIBRARY) -# 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 { |