diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-22 10:58:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 15:18:18 +0200 |
| commit | 32959ce17c71d7629d78c65c6a94889e033b8b21 (patch) | |
| tree | bd4bebf943f7f2f5adb1bf0353c310c34bf185be | |
| parent | 6accd655bb66c3761be1e07af2f2af8957414b68 (diff) | |
| download | qt3d-32959ce17c71d7629d78c65c6a94889e033b8b21.tar.gz | |
Update the export macros in qt3d.git
Use the new, simpler QT_STATIC macro.
Change-Id: I59954b6739bd354e547ecd83d291344663afb973
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/quick3d/qt3dquickglobal.h | 19 | ||||
| -rw-r--r-- | src/threed/global/qt3dglobal.h | 20 |
2 files changed, 4 insertions, 35 deletions
diff --git a/src/quick3d/qt3dquickglobal.h b/src/quick3d/qt3dquickglobal.h index 1d3000fbc..02bdf062d 100644 --- a/src/quick3d/qt3dquickglobal.h +++ b/src/quick3d/qt3dquickglobal.h @@ -44,29 +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) /* create a Qt DLL library */ -# if defined(QT_DLL) -# undef QT_DLL -# endif +#ifndef QT_STATIC # if defined(QT_BUILD_3DQUICK_LIB) # define Q_QT3D_QUICK_EXPORT Q_DECL_EXPORT # else # define Q_QT3D_QUICK_EXPORT Q_DECL_IMPORT # endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QT3D_QUICK_EXPORT Q_DECL_IMPORT -# endif -#endif -#if !defined(Q_QT3D_QUICK_EXPORT) -# if defined(QT_SHARED) -# define Q_QT3D_QUICK_EXPORT Q_DECL_EXPORT -# else +#else # define Q_QT3D_QUICK_EXPORT -# endif #endif #endif diff --git a/src/threed/global/qt3dglobal.h b/src/threed/global/qt3dglobal.h index 4aab40d07..414f018dc 100644 --- a/src/threed/global/qt3dglobal.h +++ b/src/threed/global/qt3dglobal.h @@ -44,30 +44,14 @@ #include <QtCore/qglobal.h> -// XXX: Move to qglobal.h eventually. -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_DLL) -# undef QT_DLL -# endif +#ifndef QT_STATIC # if defined(QT_BUILD_3D_LIB) # define Q_QT3D_EXPORT Q_DECL_EXPORT # else # define Q_QT3D_EXPORT Q_DECL_IMPORT # endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QT3D_EXPORT Q_DECL_IMPORT -# endif -#endif -#if !defined(Q_QT3D_EXPORT) -# if defined(QT_SHARED) -# define Q_QT3D_EXPORT Q_DECL_EXPORT -# else +#else # define Q_QT3D_EXPORT -# endif #endif #endif |