From 940f14c3b6da270cdf3e7574f06accb82fe3ed5e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 22 Jun 2012 11:08:07 +0200 Subject: Update the export macros in qtmultimedia.git Use the new, simpler QT_STATIC macro. Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483 Reviewed-by: Oswald Buddenhagen --- src/multimedia/qtmultimediadefs.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h index 6200a133a..b7cf655b3 100644 --- a/src/multimedia/qtmultimediadefs.h +++ b/src/multimedia/qtmultimediadefs.h @@ -57,30 +57,14 @@ QT_BEGIN_HEADER -#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_MULTIMEDIA_LIB) # define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT # endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_MULTIMEDIA_EXPORT) -# if defined(QT_SHARED) -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# else +#else # define Q_MULTIMEDIA_EXPORT -# endif #endif QT_END_HEADER -- cgit v1.2.3