summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-09-15 14:43:57 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-09-16 09:18:52 (GMT)
commit61161589376a3bb2dffaf898ca50449774b48565 (patch)
tree1c50a3b4ca8ef32cac5cf49e222c00a4935ea1eb /src
parentbca1ca80159dc5d8161b5e4bc84584b793414ff6 (diff)
downloadQt-61161589376a3bb2dffaf898ca50449774b48565.zip
Qt-61161589376a3bb2dffaf898ca50449774b48565.tar.gz
Qt-61161589376a3bb2dffaf898ca50449774b48565.tar.bz2
Make mmfphonondebug static, and do some build fixes.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h4
-rw-r--r--src/plugins/phonon/mmf/mmf.pro2
-rw-r--r--src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro4
-rw-r--r--src/plugins/phonon/mmf/plugin/plugin.pro2
4 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h
index ff031c4..b8987e0 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_global.h
@@ -22,9 +22,9 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QtCore/QtGlobal>
#if defined(OBJECTDUMP_LIBRARY)
-# define OBJECTDUMP_EXPORT Q_DECL_EXPORT
+# define OBJECTDUMP_EXPORT
#else
-# define OBJECTDUMP_EXPORT Q_DECL_IMPORT
+# define OBJECTDUMP_EXPORT
#endif
#endif
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index da73fdc..ff27ea1 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,2 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = mmfphonondebug plugin
+
+plugin.depends = mmfphonondebug
diff --git a/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro b/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro
index 6cce2e6..2cfec15 100644
--- a/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro
+++ b/src/plugins/phonon/mmf/mmfphonondebug/mmfphonondebug.pro
@@ -1,8 +1,8 @@
TEMPLATE = lib
-TARGET = mmfphonondebug
+TARGET = phonon_mmf_debug
OBJECTDUMP_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf/mmfphonondebug
-CONFIG += dll
+CONFIG += staticlib
DEFINES += OBJECTDUMP_LIBRARY
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
index b1f3bfb..c7bb327d 100644
--- a/src/plugins/phonon/mmf/plugin/plugin.pro
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -62,7 +62,7 @@ SOURCES += \
debug {
INCLUDEPATH += $$PHONON_MMF_DIR/mmfphonondebug
- LIBS += -lmmfphonondebug
+ LIBS += -lphonon_mmf_debug.lib
}
LIBS += -lmediaclientvideo # For CVideoPlayerUtility