summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-17 15:31:02 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-08-17 15:31:02 (GMT)
commit6b7603a0a2fed844b1264d8deb0ce78b110858c4 (patch)
tree8391da90dee664d55fb2629c07a03a3b3b26f940 /src/3rdparty
parent257984d8b8cf31394c4f20070ea045f5ae7fa170 (diff)
downloadQt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.zip
Qt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.tar.gz
Qt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.tar.bz2
Rename mmf_videoplayer back to videoplayer, apparently the includes can be
resolved anyway.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/videoplayer.cpp (renamed from src/3rdparty/phonon/mmf/mmf_videoplayer.cpp)2
-rw-r--r--src/3rdparty/phonon/mmf/videoplayer.h (renamed from src/3rdparty/phonon/mmf/mmf_videoplayer.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index e9e4b5b..877e463 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -18,7 +18,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "abstractplayer.h"
#include "audioplayer.h"
-#include "mmf_videoplayer.h"
+#include "videoplayer.h"
#include "mediaobject.h"
using namespace Phonon;
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp
index c226835..f465c96 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer.cpp
@@ -20,7 +20,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QTimer>
#include <private/qcore_symbian_p.h>
-#include "mmf_videoplayer.h"
+#include "videoplayer.h"
#include "audiooutput.h"
#include "utils.h"
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/videoplayer.h
index 3ea9c1a..3ea9c1a 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h
+++ b/src/3rdparty/phonon/mmf/videoplayer.h