diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-17 15:31:02 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-17 15:31:02 (GMT) |
| commit | 6b7603a0a2fed844b1264d8deb0ce78b110858c4 (patch) | |
| tree | 8391da90dee664d55fb2629c07a03a3b3b26f940 | |
| parent | 257984d8b8cf31394c4f20070ea045f5ae7fa170 (diff) | |
| download | Qt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.zip Qt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.tar.gz Qt-6b7603a0a2fed844b1264d8deb0ce78b110858c4.tar.bz2 | |
Rename mmf_videoplayer back to videoplayer, apparently the includes can be
resolved anyway.
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 2 | ||||
| -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 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 4 |
4 files changed, 4 insertions, 4 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 diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index 266c3db..5ac62ad 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -28,7 +28,7 @@ HEADERS += \ $$PHONON_MMF_DIR/backend.h \ $$PHONON_MMF_DIR/mediaobject.h \ $$PHONON_MMF_DIR/utils.h \ - $$PHONON_MMF_DIR/mmf_videoplayer.h + $$PHONON_MMF_DIR/videoplayer.h SOURCES += \ $$PHONON_MMF_DIR/audiooutput.cpp \ @@ -36,7 +36,7 @@ SOURCES += \ $$PHONON_MMF_DIR/backend.cpp \ $$PHONON_MMF_DIR/mediaobject.cpp \ $$PHONON_MMF_DIR/utils.cpp \ - $$PHONON_MMF_DIR/mmf_videoplayer.cpp + $$PHONON_MMF_DIR/videoplayer.cpp # This is needed for having the .qtplugin file properly created on Symbian. QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend |