remove usage of QT_MAKEDLL from QtMultimedia

Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
index a204b5f..4ab4a4a 100644 (file)
--- 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 c13529f..3488fac 100644 (file)
--- 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 8971636..adf0943 100644 (file)
--- 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