--- a/qtmobility/src/global/qmobilityglobal.h Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/global/qmobilityglobal.h Wed Jun 23 19:08:38 2010 +0300
@@ -105,10 +105,10 @@
# else
# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
# endif
-# if defined(QT_BUILD_MEDIA_LIB)
-# define Q_MEDIA_EXPORT Q_DECL_EXPORT
+# if defined(QT_BUILD_MULTIMEDIA_LIB)
+# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
# else
-# define Q_MEDIA_EXPORT Q_DECL_IMPORT
+# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
# endif
# if defined(QT_BUILD_SFW_LIB)
# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT
@@ -131,7 +131,7 @@
# define Q_CONTACTS_EXPORT Q_DECL_IMPORT
# define Q_VERSIT_EXPORT Q_DECL_IMPORT
# define Q_LOCATION_EXPORT Q_DECL_IMPORT
-# define Q_MEDIA_EXPORT Q_DECL_IMPORT
+# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
# define Q_SYSINFO_EXPORT Q_DECL_IMPORT
@@ -146,7 +146,7 @@
# define Q_CONTACTS_EXPORT Q_DECL_EXPORT
# define Q_VERSIT_EXPORT Q_DECL_EXPORT
# define Q_LOCATION_EXPORT Q_DECL_EXPORT
-# define Q_MEDIA_EXPORT Q_DECL_EXPORT
+# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
# define Q_MESSAGING_EXPORT Q_DECL_EXPORT
# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT
# define Q_SYSINFO_EXPORT Q_DECL_EXPORT
@@ -157,7 +157,7 @@
# define Q_CONTACTS_EXPORT
# define Q_VERSIT_EXPORT
# define Q_LOCATION_EXPORT
-# define Q_MEDIA_EXPORT
+# define Q_MULTIMEDIA_EXPORT
# define Q_MESSAGING_EXPORT
# define Q_SERVICEFW_EXPORT
# define Q_SYSINFO_EXPORT