--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 #define USE_PLAYBIN2
 #endif
 
@@ -658,7 +658,7 @@
 
     for (int i=0; i<m_streamTypes.count(); i++) {
         QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
-        QMap<QtMedia::MetaData, QVariant> streamProperties;
+        QMap<QtMediaServices::MetaData, QVariant> streamProperties;
 
         int streamIndex = i - m_playbin2StreamOffset[streamType];
 
@@ -680,7 +680,7 @@
         if (tags && gst_is_tag_list(tags)) {
             gchar *languageCode = 0;
             if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
-                streamProperties[QtMedia::Language] = QString::fromUtf8(languageCode);
+                streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode);
 
             //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
             g_free (languageCode);
@@ -733,8 +733,8 @@
             break;
         }
 
-        QMap<QtMedia::MetaData, QVariant> streamProperties;
-        streamProperties[QtMedia::Language] = QString::fromUtf8(languageCode);
+        QMap<QtMediaServices::MetaData, QVariant> streamProperties;
+        streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode);
 
         m_streamProperties.append(streamProperties);
         m_streamTypes.append(streamType);