diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-23 11:29:37 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-23 12:40:01 (GMT) |
| commit | 9161598b9cb374889ca6c69831c035c1eaa4d56e (patch) | |
| tree | 7a1e39f3666e29db585990c68ed871e68335b739 | |
| parent | c82f3b18ba300f09688fe410cf09b219a0fd6d44 (diff) | |
| download | Qt-9161598b9cb374889ca6c69831c035c1eaa4d56e.zip Qt-9161598b9cb374889ca6c69831c035c1eaa4d56e.tar.gz Qt-9161598b9cb374889ca6c69831c035c1eaa4d56e.tar.bz2 | |
Rename videoplayer, to avoid clash with Symbian's headers.
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.cpp (renamed from src/3rdparty/phonon/mmf/videoplayer.cpp) | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.h (renamed from src/3rdparty/phonon/mmf/videoplayer.h) | 0 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/plugin/plugin.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 cf968f3..de0de59 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -22,7 +22,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "dummyplayer.h" #include "utils.h" #include "utils.h" -#include "videoplayer.h" +#include "mmf_videoplayer.h" #include "videowidget.h" #include "mediaobject.h" diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp index 6c4641d..0c47ece 100644 --- a/src/3rdparty/phonon/mmf/videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp @@ -23,7 +23,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <coemain.h> // For CCoeEnv #include <coecntrl.h> -#include "videoplayer.h" +#include "mmf_videoplayer.h" #include "utils.h" #ifdef _DEBUG diff --git a/src/3rdparty/phonon/mmf/videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h index 2878d6a..2878d6a 100644 --- a/src/3rdparty/phonon/mmf/videoplayer.h +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h 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 { |