summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-09-23 11:29:37 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-09-23 12:40:01 (GMT)
commit9161598b9cb374889ca6c69831c035c1eaa4d56e (patch)
tree7a1e39f3666e29db585990c68ed871e68335b739 /src/plugins
parentc82f3b18ba300f09688fe410cf09b219a0fd6d44 (diff)
downloadQt-9161598b9cb374889ca6c69831c035c1eaa4d56e.zip
Qt-9161598b9cb374889ca6c69831c035c1eaa4d56e.tar.gz
Qt-9161598b9cb374889ca6c69831c035c1eaa4d56e.tar.bz2
Rename videoplayer, to avoid clash with Symbian's headers.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/phonon/mmf/plugin/plugin.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
index a7ec8a1..de108a6 100644
--- a/src/plugins/phonon/mmf/plugin/plugin.pro
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -38,7 +38,7 @@ HEADERS += \
$$PHONON_MMF_DIR/utils.h \
$$PHONON_MMF_DIR/videooutput.h \
$$PHONON_MMF_DIR/videooutputobserver.h \
- $$PHONON_MMF_DIR/videoplayer.h \
+ $$PHONON_MMF_DIR/mmf_videoplayer.h \
$$PHONON_MMF_DIR/videowidget.h \
$$PHONON_MMF_DIR/volumeobserver.h
@@ -57,7 +57,7 @@ SOURCES += \
$$PHONON_MMF_DIR/mediaobject.cpp \
$$PHONON_MMF_DIR/utils.cpp \
$$PHONON_MMF_DIR/videooutput.cpp \
- $$PHONON_MMF_DIR/videoplayer.cpp \
+ $$PHONON_MMF_DIR/mmf_videoplayer.cpp \
$$PHONON_MMF_DIR/videowidget.cpp
debug {