don't use convenience headers on Symbian. They don't work yet and

breaks ROM build process at the moment

19 files changed, 24 insertions, 24 deletions

diff --git a/plugins/multimedia/symbian/common/s60videooutputcontrol.h b/plugins/multimedia/symbian/common/s60videooutputcontrol.h
index 10d21b7ab6..6a30214f08 100644
--- a/plugins/multimedia/symbian/common/s60videooutputcontrol.h
+++ b/plugins/multimedia/symbian/common/s60videooutputcontrol.h
@@ -43,7 +43,7 @@
 #define S60VIDEOOUTPUTCONTROL_H
 
 #include <QObject>
-#include <QVideoOutputControl>
+#include <qvideooutputcontrol.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
index 18cddbd525..f5c50b3164 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 
-#include <QMediaService>
+#include <qmediaservice.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
index 35d006c40d..1f0b7985f5 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
@@ -49,7 +49,7 @@
 #include <QList>
 #include <QHash>
 #include <QAudioFormat>
-#include <QMediaRecorder>
+#include <qmediarecorder.h>
 
 #include <Mda\Common\Audio.h>
 #include <Mda\Common\Resource.h>
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
index de9e56b525..a79f4ad07a 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
@@ -42,7 +42,7 @@
 #ifndef AUDIOENCODERCONTROL_H
 #define AUDIOENCODERCONTROL_H
 
-#include <QAudioEncoderControl>
+#include <qaudioencodercontrol.h>
 #include <QtCore/qstringlist.h>
 #include <QAudioFormat>
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
index 316fd21f20..db1bb543a2 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
@@ -44,7 +44,7 @@
 
 #include <QStringList>
 
-#include <QAudioEndpointSelector>
+#include <qaudioendpointselector.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
index f3807ef15f..2c2c8e0d4d 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
@@ -42,7 +42,7 @@
 #ifndef S60MEDIAMETADATAPROVIDER_H
 #define S60MEDIAMETADATAPROVIDER_H
 
-#include <QMetaDataControl>
+#include <qmetadatacontrol.h>
 #include "ms60mediaplayerresolver.h"
 
 QT_USE_NAMESPACE
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
index eb8215b005..76397995a0 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
@@ -44,7 +44,7 @@
 
 #include <QStringList>
 
-#include <QAudioEndpointSelector>
+#include <qaudioendpointselector.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
index af3879b789..1f3836c331 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 
-#include <QMediaPlayerControl>
+#include <qmediaplayercontrol.h>
 
 #include "ms60mediaplayerresolver.h"
 #include <QtCore/qdebug.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
index b80df24024..79c952d295 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
@@ -55,8 +55,8 @@
 #include "s60videorenderer.h"
 #include "s60mediaplayeraudioendpointselector.h"
 
-#include <QMediaPlaylistNavigator>
-#include <QMediaPlaylist>
+#include <qmediaplaylistnavigator.h>
+#include <qmediaplaylist.h>
 
 S60MediaPlayerService::S60MediaPlayerService(QObject *parent)
     : QMediaService(parent)
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
index 28f13a16f8..d7d0621dd7 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/qobject.h>
 
-#include <QMediaService>
-#include <QVideoOutputControl>
+#include <qmediaservice.h>
+#include <qvideooutputcontrol.h>
 
 #include "s60videooutputcontrol.h"
 #include "ms60mediaplayerresolver.h"
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
index 60f854f66b..98ad19db9f 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qpair.h>
-#include <QMediaPlayer>
+#include <qmediaplayer.h>
 #include <e32cmn.h> // for TDesC
 #include <QRect>
 #include "s60mediaplayerservice.h"
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h
index 4fd27ee2fb..3e55b95f17 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h
@@ -43,7 +43,7 @@
 #define S60VIDEOOVERLAY_H
 
 #include <QtCore/qobject.h>
-#include <QVideoWindowControl>
+#include <qvideowindowcontrol.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
index 56eef5fc90..36f0b0365f 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
@@ -46,7 +46,7 @@
 #include "s60mediaplayeraudioendpointselector.h"
 #include <videoplayer.h>
 #include <QtGui/qwidget.h>
-#include <QVideoWidget>
+#include <qvideowidget.h>
 
 #include <AudioOutput.h>
 #include <MAudioOutputObserver.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h
index f725bcd068..dbf018f147 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h
@@ -43,7 +43,7 @@
 #define S60VIDEORENDERER_H
 
 #include <QtCore/qobject.h>
-#include <QVideoRendererControl>
+#include <qvideorenderercontrol.h>
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h
index e0c4b65e51..6a0e7c20e0 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h
@@ -42,7 +42,7 @@
 #ifndef S60VIDEOWIDGET_H
 #define S60VIDEOWIDGET_H
 
-#include <QVideoWidgetControl>
+#include <qvideowidgetcontrol.h>
 #include <qmediaplayer.h>
 
 QT_USE_NAMESPACE
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
index 3e2198e660..cd8e5e87c2 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
@@ -43,8 +43,8 @@
 #define S60RADIOTUNERCONTROL_H
 
 #include <QtCore/qobject.h>
-#include <QRadioTunerControl>
-#include <QRadioTuner>
+#include <qradiotunercontrol.h>
+#include <qradiotuner.h>
 #include <tuner.h>
 
 class S60RadioTunerService;
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
index 7183794edb..2656e2d4e6 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
@@ -43,8 +43,8 @@
 #define S60RADIOTUNERCONTROL_H
 
 #include <QtCore/qobject.h>
-#include <QRadioTunerControl>
-#include <QRadioTuner>
+#include <qradiotunercontrol.h>
+#include <qradiotuner.h>
 
 #include <radioutility.h>
 #include <radiofmtunerutility.h>
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
index 946b726e73..64f1be72e0 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 
-#include <QMediaService>
+#include <qmediaservice.h>
 
 #ifdef TUNERLIBUSED
 #include "s60radiotunercontrol_31.h"
diff --git a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
index 8e6c7165f5..3a1500a11a 100644
--- a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
+++ b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
@@ -44,8 +44,8 @@
 #define S60SERVICEPLUGIN_H
 
 #include <QtCore/qobject.h>
-#include <QMediaService>
-#include <QMediaServiceProviderPlugin>
+#include <qmediaservice.h>
+#include <qmediaserviceproviderplugin.h>
 
 QT_USE_NAMESPACE