From 26dffa25391cb900c61f79d8bd327a5827973a79 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 7 Jun 2012 15:00:23 +0200 Subject: Use the new QT_STATIC macro from qglobal.h This simplifies the handling of static vs shared/DLL builds. Change-Id: I547df9bc1da3dd0dca4c621f46450328e47cab3c Reviewed-by: Oswald Buddenhagen --- src/declarative/qtquick1global.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/declarative') diff --git a/src/declarative/qtquick1global.h b/src/declarative/qtquick1global.h index 9e8f2a5f..ae9ed692 100644 --- a/src/declarative/qtquick1global.h +++ b/src/declarative/qtquick1global.h @@ -50,24 +50,14 @@ # undef Q_QUICK1_EXPORT #endif -#if defined(Q_OS_WIN) -# if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QUICK1_LIB) -# define Q_QUICK1_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK1_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QUICK1_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_QUICK1_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_QUICK1_LIB) # define Q_QUICK1_EXPORT Q_DECL_EXPORT # else -# define Q_QUICK1_EXPORT +# define Q_QUICK1_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_QUICK1_EXPORT #endif #endif // QTQUICK1GLOBAL_H -- cgit v1.2.3