diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-01-27 10:18:30 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-01-27 19:58:29 +0000 |
| commit | 474ad03e4977116c12e7cd87c26295c8590b1f60 (patch) | |
| tree | 1c6c11bfc7d1329e2bc3f527ab441e2ad3502c6d | |
| parent | eaf3ca9683d2a6556e790b95b9598da5786c7f71 (diff) | |
Fix static builds
Change-Id: I3731706ea9aba29a422699f1a38bc48e3c1fdcf3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/bulletphysics/qt3dbulletphysics_global.h | 10 | ||||
| -rw-r--r-- | src/core/qt3dcore_global.h | 10 | ||||
| -rw-r--r-- | src/input/qt3dinput_global.h | 10 | ||||
| -rw-r--r-- | src/openal/qt3dopenal_global.h | 10 | ||||
| -rw-r--r-- | src/quick3d/quick3d/qt3dquick_global.h | 10 | ||||
| -rw-r--r-- | src/quick3d/quick3drenderer/qt3dquickrenderer_global.h | 10 | ||||
| -rw-r--r-- | src/render/qt3drenderer_global.h | 10 |
7 files changed, 49 insertions, 21 deletions
diff --git a/src/bulletphysics/qt3dbulletphysics_global.h b/src/bulletphysics/qt3dbulletphysics_global.h index ad7a916a6..4d17096fc 100644 --- a/src/bulletphysics/qt3dbulletphysics_global.h +++ b/src/bulletphysics/qt3dbulletphysics_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DBULLETPHYSICS_LIBRARY) -# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DBULLETPHYSICS_LIBRARY) +# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DBULLETPHYSICSSHARED_EXPORT Q_DECL_IMPORT +# define QT3DBULLETPHYSICSSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h index c6b7de8af..f0086bee6 100644 --- a/src/core/qt3dcore_global.h +++ b/src/core/qt3dcore_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DCORE_LIBRARY) -# define QT3DCORESHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DCORE_LIBRARY) +# define QT3DCORESHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DCORESHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DCORESHARED_EXPORT Q_DECL_IMPORT +# define QT3DCORESHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/input/qt3dinput_global.h b/src/input/qt3dinput_global.h index b9ae5fd70..f3fb5578b 100644 --- a/src/input/qt3dinput_global.h +++ b/src/input/qt3dinput_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DINPUT_LIBRARY) -# define QT3DINPUTSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DINPUT_LIBRARY) +# define QT3DINPUTSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DINPUTSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DINPUTSHARED_EXPORT Q_DECL_IMPORT +# define QT3DINPUTSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/openal/qt3dopenal_global.h b/src/openal/qt3dopenal_global.h index e3ca96e17..6f50c2617 100644 --- a/src/openal/qt3dopenal_global.h +++ b/src/openal/qt3dopenal_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DOPENAL_LIBRARY) -# define QT3DOPENALSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DOPENAL_LIBRARY) +# define QT3DOPENALSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DOPENALSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DOPENALSHARED_EXPORT Q_DECL_IMPORT +# define QT3DOPENALSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global.h b/src/quick3d/quick3d/qt3dquick_global.h index a3c45d7f0..ec916dae2 100644 --- a/src/quick3d/quick3d/qt3dquick_global.h +++ b/src/quick3d/quick3d/qt3dquick_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DQUICK_LIBRARY) -# define QT3DQUICKSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DQUICK_LIBRARY) +# define QT3DQUICKSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DQUICKSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DQUICKSHARED_EXPORT Q_DECL_IMPORT +# define QT3DQUICKSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h index 5b27ee82c..72161b833 100644 --- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h +++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DQUICKRENDERER_LIBRARY) -# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DQUICKRENDERER_LIBRARY) +# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_IMPORT +# define QT3DQUICKRENDERERSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/render/qt3drenderer_global.h b/src/render/qt3drenderer_global.h index c9a652c6c..625b1087d 100644 --- a/src/render/qt3drenderer_global.h +++ b/src/render/qt3drenderer_global.h @@ -46,10 +46,14 @@ QT_BEGIN_NAMESPACE -#if defined(QT3DRENDERER_LIBRARY) -# define QT3DRENDERERSHARED_EXPORT Q_DECL_EXPORT +#if defined(QT_SHARED) || !defined(QT_STATIC) +# if defined(QT3DRENDERER_LIBRARY) +# define QT3DRENDERERSHARED_EXPORT Q_DECL_EXPORT +# else +# define QT3DRENDERERSHARED_EXPORT Q_DECL_IMPORT +# endif #else -# define QT3DRENDERERSHARED_EXPORT Q_DECL_IMPORT +# define QT3DRENDERERSHARED_EXPORT #endif QT_END_NAMESPACE |