diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-22 11:16:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 14:51:43 +0200 |
| commit | 2c3c1e7d7a374baa3dd98bde3ea63a388f79b249 (patch) | |
| tree | f67016d02714cceff1e427e2264007b80933bb2e /src/serviceframework | |
| parent | 9e69df9c7b589cca2483cdde13486a97c3319762 (diff) | |
Update the export macros in qtsystems.git
Use the new, simpler QT_STATIC macro.
Change-Id: I44381e608d2b65388a6f395d08060b7972821d9d
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/serviceframework')
| -rw-r--r-- | src/serviceframework/qserviceframeworkglobal.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/serviceframework/qserviceframeworkglobal.h b/src/serviceframework/qserviceframeworkglobal.h index bee1b7e0..8fc9d65b 100644 --- a/src/serviceframework/qserviceframeworkglobal.h +++ b/src/serviceframework/qserviceframeworkglobal.h @@ -43,30 +43,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_SERVICEFRAMEWORK_LIB) # define Q_SERVICEFW_EXPORT Q_DECL_EXPORT # else # define Q_SERVICEFW_EXPORT Q_DECL_IMPORT # endif -# elif defined(QT_DLL) -# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_SERVICEFW_EXPORT) -# if defined(QT_SHARED) -# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT -# else +#else # define Q_SERVICEFW_EXPORT -# endif #endif #endif // QSERVICEFRAMEWORK_H |