From f7faf946d5f05052712dfcf554d2d839432ed561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 20 May 2016 06:27:39 +0300 Subject: Use standardized module export macros Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8 Reviewed-by: Miikka Heikkinen Reviewed-by: Oswald Buddenhagen --- .../global/qdatavisualizationglobal.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/datavisualization/global/qdatavisualizationglobal.h') 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 } -- cgit v1.2.3 From d8ad287b81523871af4b737ae91cda7334bd6f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 23 May 2016 11:36:47 +0300 Subject: Remove unused non-standard test export macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifcfb6eaddfd5e54820bb3f5af235833b7f906b3c Reviewed-by: Tomi Korpipää --- src/datavisualization/global/qdatavisualizationglobal.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/datavisualization/global/qdatavisualizationglobal.h') diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index cda15d0c..d2ce2e0a 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -44,14 +44,6 @@ # define QT_DATAVISUALIZATION_EXPORT #endif -#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_BUILD_DATAVISUALIZATION_LIB) -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_IMPORT -#else -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT -#endif - #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_END_NAMESPACE_DATAVISUALIZATION } -- cgit v1.2.3