diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-22 11:10:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 01:48:34 +0200 |
| commit | e25adc633f5bf8fd8df1ea89015849850c7a5401 (patch) | |
| tree | cdb3d978835fa0ded416ef600f726b91a1184c10 /src | |
| parent | e26050930648772adc027be2ac6409f43e0a8b66 (diff) | |
Update the export macros in qtsensors.git
Use the new, simpler QT_STATIC macro.
Change-Id: I20bad6db7a77227d7d4213e43b1350468f44b9a2
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sensors/qsensorsglobal.h | 20 |
1 files 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 <QtCore/qglobal.h> -#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 |