From e25adc633f5bf8fd8df1ea89015849850c7a5401 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 22 Jun 2012 11:10:49 +0200 Subject: Update the export macros in qtsensors.git Use the new, simpler QT_STATIC macro. Change-Id: I20bad6db7a77227d7d4213e43b1350468f44b9a2 Reviewed-by: Lincoln Ramsay --- src/sensors/qsensorsglobal.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/sensors/qsensorsglobal.h b/src/sensors/qsensorsglobal.h index 3037370f..72b3902e 100644 --- a/src/sensors/qsensorsglobal.h +++ b/src/sensors/qsensorsglobal.h @@ -44,30 +44,14 @@ #include -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) -# if defined(QT_DLL) -# undef QT_DLL -# endif +#ifndef QT_STATIC # if defined(QT_BUILD_SENSORS_LIB) # define Q_SENSORS_EXPORT Q_DECL_EXPORT # else # define Q_SENSORS_EXPORT Q_DECL_IMPORT # endif -# elif defined(QT_DLL) -# define Q_SENSORS_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_SENSORS_EXPORT) -# if defined(QT_SHARED) -# define Q_SENSORS_EXPORT Q_DECL_EXPORT -# else +#else # define Q_SENSORS_EXPORT -# endif #endif #endif // QSENSORSGLOBAL_H -- cgit v1.2.3