summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-09-15 10:57:15 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-09-15 10:57:15 (GMT)
commitbca1ca80159dc5d8161b5e4bc84584b793414ff6 (patch)
tree051d8294b651af79e4b4c7d4f3380bbded79f9d3
parentb6b365696ebdbb3dad1a58c5506cacc948057cb5 (diff)
downloadQt-bca1ca80159dc5d8161b5e4bc84584b793414ff6.zip
Qt-bca1ca80159dc5d8161b5e4bc84584b793414ff6.tar.gz
Qt-bca1ca80159dc5d8161b5e4bc84584b793414ff6.tar.bz2
Fixes to include paths, required due to objectdump renaming
-rw-r--r--src/3rdparty/phonon/mmf/videooutput.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/videoplayer.cpp2
-rw-r--r--src/plugins/phonon/mmf/plugin/plugin.pro4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 8ff9a33..2544a97 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 "mmfphonondebug/objectdump.h"
+#include "objectdump.h"
#endif
#include <QPaintEvent>
diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp
index 0d98256..827c2a1 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer.cpp
@@ -27,7 +27,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "utils.h"
#ifdef _DEBUG
-#include "objectdump/objectdump.h"
+#include "objectdump.h"
#endif
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
index c7aad69..b1f3bfb 100644
--- a/src/plugins/phonon/mmf/plugin/plugin.pro
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -61,8 +61,8 @@ SOURCES += \
$$PHONON_MMF_DIR/videowidget.cpp
debug {
- INCLUDEPATH += $$PHONON_MMF_DIR/objectdump
- LIBS += -lobjectdump
+ INCLUDEPATH += $$PHONON_MMF_DIR/mmfphonondebug
+ LIBS += -lmmfphonondebug
}
LIBS += -lmediaclientvideo # For CVideoPlayerUtility