summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-10-14 13:59:41 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-10-14 13:59:41 (GMT)
commit8e4d6e42629feea38376e429462dc045354f8255 (patch)
tree920edc2c789748066170b23085a078603a45b5cd /mkspecs/features
parentc19f93eee1219ff91772f34d32b8ff4c20a4341d (diff)
parent81bc22dbd71e2dd0e25156e753afc6d94d808de9 (diff)
downloadQt-8e4d6e42629feea38376e429462dc045354f8255.zip
Qt-8e4d6e42629feea38376e429462dc045354f8255.tar.gz
Qt-8e4d6e42629feea38376e429462dc045354f8255.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'mkspecs/features')
-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 =