diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-09-10 17:11:07 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-12 12:37:50 +0200 |
| commit | ecc6cf4cd56324d8cb19e1c5a049219ecdf67d80 (patch) | |
| tree | 53614896e923cbfdc6b33147b4597c3900f011bf | |
| parent | 946ff68c42f9f763f1e3e6979ca8de7ff6984d43 (diff) | |
remove usage of QT_MAKEDLL from QtMultimedia
Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
3 files changed, 4 insertions, 38 deletions
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h index a204b5fec..4ab4a4ad2 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.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_QTMM_QUICK_LIB) # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT # 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 -# endif #endif QT_END_HEADER diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index c13529fbf..3488fac19 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -59,30 +59,14 @@ QT_BEGIN_HEADER QT_MODULE(Multimedia) -#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_MULTIMEDIAWIDGETS_LIB) # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT # 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 -# endif #endif QT_END_HEADER diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 897163694..adf094320 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -4,8 +4,6 @@ CONFIG += internal_module load(qt_module) -!static:DEFINES += QT_MAKEDLL - DEFINES += QT_BUILD_QTMM_QUICK_LIB # Header files must go inside source directory of a module |