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

remove usage of QT_MAKEDLL from QtMultimedia

Browse Source 
Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Joerg Bornemann
2012-09-10 17:11:07 +02:00
committed by Qt by Nokia
parent 946ff68c42
commit ecc6cf4cd5
3 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
View File

@@ -57,31 +57,15 @@
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_QTMM_QUICK_LIB) # if defined(QT_BUILD_QTMM_QUICK_LIB)
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT
# else # else
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT
# endif # endif
# elif defined(QT_DLL) /* use a Qt DLL library */
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT
# endif
#endif
#if !defined(Q_MULTIMEDIAQUICK_EXPORT)
# if defined(QT_SHARED)
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT
#else #else
# define Q_MULTIMEDIAQUICK_EXPORT # define Q_MULTIMEDIAQUICK_EXPORT
#endif #endif
#endif
QT_END_HEADER QT_END_HEADER

18
src/multimediawidgets/qtmultimediawidgetdefs.h
View File

@@ -59,31 +59,15 @@ QT_BEGIN_HEADER
QT_MODULE(Multimedia) QT_MODULE(Multimedia)
#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_MULTIMEDIAWIDGETS_LIB) # if defined(QT_BUILD_MULTIMEDIAWIDGETS_LIB)
# define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT
# else # else
# define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT
# endif # endif
# elif defined(QT_DLL) /* use a Qt DLL library */
# define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT
# endif
#endif
#if !defined(Q_MULTIMEDIAWIDGETS_EXPORT)
# if defined(QT_SHARED)
# define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT
#else #else
# define Q_MULTIMEDIAWIDGETS_EXPORT # define Q_MULTIMEDIAWIDGETS_EXPORT
#endif #endif
#endif
QT_END_HEADER QT_END_HEADER

2
src/qtmultimediaquicktools/qtmultimediaquicktools.pro
View File

@@ -4,8 +4,6 @@ CONFIG += internal_module
load(qt_module) load(qt_module)
!static:DEFINES += QT_MAKEDLL
DEFINES += QT_BUILD_QTMM_QUICK_LIB DEFINES += QT_BUILD_QTMM_QUICK_LIB
# Header files must go inside source directory of a module # Header files must go inside source directory of a module