diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
| commit | 43c0bfb2af436f6b27cdccb156ecac1d1f3711dc (patch) | |
| tree | 4767c7bd4e78baf68961c474aed727a949f86b74 /src/datavisualization/global/qdatavisualizationglobal.h | |
| parent | e91b9713cc956770a38c1ba4db996c24612c4fa4 (diff) | |
| parent | 2523056490c3f7a35d176deb583ba46899fe260b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
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 { |