slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the export macros in qtmultimedia.git

Browse Source 
Use the new, simpler QT_STATIC macro.

Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Thiago Macieira
2012-06-22 11:08:07 +02:00
committed by Qt by Nokia
parent d18eadc8ab
commit 940f14c3b6
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/multimedia/qtmultimediadefs.h
View File

@@ -57,30 +57,14 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
#if defined(Q_OS_WIN) #ifndef QT_STATIC
# if defined(QT_NODLL)
# undef QT_MAKEDLL
# undef QT_DLL
# elif defined(QT_MAKEDLL)
# if defined(QT_DLL)
# undef QT_DLL
# endif
# if defined(QT_BUILD_MULTIMEDIA_LIB) # if defined(QT_BUILD_MULTIMEDIA_LIB)
# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT # define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
# else # else
# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT # define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
# endif # endif
# elif defined(QT_DLL) /* use a Qt DLL library */ #else
# 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
# define Q_MULTIMEDIA_EXPORT # define Q_MULTIMEDIA_EXPORT
# endif
#endif #endif
QT_END_HEADER QT_END_HEADER