Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.
authorFrans Englich <frans.englich@nokia.com>
Mon, 9 Nov 2009 11:10:24 +0000 (12:10 +0100)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 18 Nov 2009 05:42:04 +0000 (15:42 +1000)
commitd0b0b525deb34ad84b580bd76470f4f6d2da5b04
treecf1140cef50721ad22efca0f19e244d25e78e300
parent9400fa45501cfe7d0a22e4b2567d9432e2906179
Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.

The debug{} directive in src/plugins/phonon/mmf/plugin/plugin.pro does not have
any effect - this can be seen by looking at the generated MMP file, which has a
STATICLIBRARY directive which is applied in both UDEB and UREL builds. This is
the general problem that .pro files cannot tell distinction between the
different targets that one makespec covers.

Also remove objectdumpstub; objectdump was originally prepared for QtGui
inclusion, but since that never happened, no other platforms than Symbian needs
to be covered.

Task-number: QTBUG-5466
Reviewed-by: Gareth Stockwell
(cherry picked from commit cc2d8068fea504483b2602128e2169b482feb308)
18 files changed:
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.h [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_stub.cpp [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.h [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp [deleted file]
src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.h [deleted file]
src/3rdparty/phonon/mmf/objectdump.cpp [new file with mode: 0644]
src/3rdparty/phonon/mmf/objectdump.h [new file with mode: 0644]
src/3rdparty/phonon/mmf/objectdump_global.h [new file with mode: 0644]
src/3rdparty/phonon/mmf/objectdump_symbian.cpp [new file with mode: 0644]
src/3rdparty/phonon/mmf/objectdump_symbian.h [new file with mode: 0644]
src/3rdparty/phonon/mmf/objecttree.cpp [new file with mode: 0644]
src/3rdparty/phonon/mmf/objecttree.h [new file with mode: 0644]
src/plugins/phonon/mmf/mmf.pro
src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro [deleted file]
src/plugins/phonon/mmf/plugin/plugin.pro [deleted file]