diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qmediaplayer.cpp
--- a/qtmobility/src/multimedia/qmediaplayer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,7 +57,7 @@
 #include "qvideowidget.h"
 #include "qgraphicsvideoitem.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlayer
@@ -649,7 +649,7 @@
     The \a flags argument allows additional requirements such as performance indicators to be
     specified.
 */
-QtMedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
+QtMediaServices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
                                                const QStringList& codecs,
                                                Flags flags)
 {
@@ -957,5 +957,5 @@
 */
 
 #include "moc_qmediaplayer.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE