summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-10-15 08:51:18 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-10-15 08:51:18 (GMT)
commit16dab236acbd35c351c1ac1d36dbf018db0d278c (patch)
tree396d2df5d1ea2a3b46df3ec6b15b8bc4c10c3c37
parent6c694eaae2b40be57c3292f43e085893095d9722 (diff)
parent73bf8967c604054baaa9f80640f44dc82e5d7220 (diff)
downloadQt-16dab236acbd35c351c1ac1d36dbf018db0d278c.zip
Qt-16dab236acbd35c351c1ac1d36dbf018db0d278c.tar.gz
Qt-16dab236acbd35c351c1ac1d36dbf018db0d278c.tar.bz2
Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
-rw-r--r--mkspecs/features/qt.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 2b2a42c..7f7d882 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -163,6 +163,11 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon
INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat
INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon
+
+ # The Helix backend requires this. Since we can't let a plugin set it,
+ # we bump the values for all Symbian Phonon plugins.
+ symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000
+
} else:isEqual(QTLIB, webkit):qlib = QtWebKit
else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
else:message("Unknown QT: $$QTLIB"):qlib =