diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-19 17:21:22 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-20 02:28:32 (GMT) |
| commit | 7a9b69c48e817b93039a4a5e1b1c202e848a3572 (patch) | |
| tree | 3498e3705108d6c9b41c6a464c68446b56379d7b /src/plugins/phonon | |
| parent | f8d374ee8bed9c672d9ff785c4fae787fb7a7d7d (diff) | |
| download | Qt-7a9b69c48e817b93039a4a5e1b1c202e848a3572.zip Qt-7a9b69c48e817b93039a4a5e1b1c202e848a3572.tar.gz Qt-7a9b69c48e817b93039a4a5e1b1c202e848a3572.tar.bz2 | |
Fix for compile error in Phonon MMF backend
This was introduced by d0b0b525de.
The use of QT_NO_DEBUG macros causes release-armv5 builds to fail
when the -release option is passed to configure.
This change causes the debugging code (ObjectDump and related
classes) to be included in release builds, although these functions
are not executed.
This is a temporary fix; task QTBUG-6012 has been created for
re-removing this code from release builds.
Reviewed-by: Frans Englich
(cherry picked from commit f3118df6af745759a73d8a9f40d1fa1a90a4385a)
Diffstat (limited to 'src/plugins/phonon')
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index 8522c06..b311529 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -39,7 +39,7 @@ HEADERS += \ $$PHONON_MMF_DIR/mmf_medianode.h \ $$PHONON_MMF_DIR/mmf_videoplayer.h \ $$PHONON_MMF_DIR/objectdump.h \ - $$PHONON_MMF_DIR/objectdump_global.h \ + $$PHONON_MMF_DIR/objectdump_symbian.h \ $$PHONON_MMF_DIR/objecttree.h \ $$PHONON_MMF_DIR/utils.h \ $$PHONON_MMF_DIR/videooutput.h \ @@ -63,14 +63,12 @@ SOURCES += \ $$PHONON_MMF_DIR/mmf_medianode.cpp \ $$PHONON_MMF_DIR/mmf_videoplayer.cpp \ $$PHONON_MMF_DIR/objectdump.cpp \ + $$PHONON_MMF_DIR/objectdump_symbian.cpp \ $$PHONON_MMF_DIR/objecttree.cpp \ $$PHONON_MMF_DIR/utils.cpp \ $$PHONON_MMF_DIR/videooutput.cpp \ $$PHONON_MMF_DIR/videowidget.cpp -HEADERS += $$PHONON_MMF_DIR/objectdump_symbian.h -SOURCES += $$PHONON_MMF_DIR/objectdump_symbian.cpp - LIBS += -lcone LIBS += -lws32 |