Rename objectdump to mmfphonondebug in order to avoid conflicts.

12 files changed, 6 insertions, 5 deletions

diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp
index 50c6bf8..50c6bf8 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump.h b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.h
index cbd9bea..cbd9bea 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump.h
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.h
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_global.h b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h
index ff031c4..ff031c4 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump_global.h
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_stub.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_stub.cpp
index 6207dac..6207dac 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump_stub.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_stub.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
index 54ebc55..54ebc55 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.h b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.h
index 26ab308..26ab308 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objectdump_symbian.h
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.h
diff --git a/src/3rdparty/phonon/mmf/objectdump/objecttree.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp
index f9d1c93..f9d1c93 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objecttree.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp
diff --git a/src/3rdparty/phonon/mmf/objectdump/objecttree.h b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.h
index f2729fa..f2729fa 100644
--- a/src/3rdparty/phonon/mmf/objectdump/objecttree.h
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.h
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 3f14f19..8ff9a33 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -21,7 +21,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "videooutputobserver.h"
 
 #ifdef _DEBUG
-#include "objectdump/objectdump.h"
+#include "mmfphonondebug/objectdump.h"
 #endif
 
 #include <QPaintEvent>
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 4e764dc..da73fdc 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,2 +1,2 @@
 TEMPLATE    = subdirs
-SUBDIRS     = objectdump plugin
+SUBDIRS     = mmfphonondebug plugin
diff --git a/src/plugins/phonon/mmf/objectdump/objectdump.pro b/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro
index 4b1245e..6cce2e6 100644
--- a/src/plugins/phonon/mmf/objectdump/objectdump.pro
+++ b/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
-TARGET = objectdump
-OBJECTDUMP_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf/objectdump
+TARGET = mmfphonondebug
+OBJECTDUMP_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf/mmfphonondebug
 
 CONFIG += dll
 
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
index d04dd99..51354ee 100644
--- a/src/s60installs/qt_libs.pro
+++ b/src/s60installs/qt_libs.pro
@@ -68,7 +68,8 @@ symbian: {
     codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
 
     contains(QT_CONFIG, phonon-backend) {
-        phonon_backend_plugins.sources += phonon_mmf.dll objectdump.dll
+        phonon_backend_plugins.sources += phonon_mmf.dll
+
         phonon_backend_plugins.path = $$QT_PLUGINS_BASE_DIR/phonon_backend
         DEPLOYMENT += phonon_backend_plugins
     }