diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-29 10:32:56 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-29 10:48:13 (GMT) |
| commit | 3b4ff89731d5e63bba91d91c0256626f92538e9d (patch) | |
| tree | 9aaf4c0f86c42319c946fca3354aa90771722762 /mkspecs | |
| parent | c874a2a97101e506148e852debc23a898691b892 (diff) | |
| download | Qt-3b4ff89731d5e63bba91d91c0256626f92538e9d.zip Qt-3b4ff89731d5e63bba91d91c0256626f92538e9d.tar.gz Qt-3b4ff89731d5e63bba91d91c0256626f92538e9d.tar.bz2 | |
Add NetworkServices capability automatically for network apps
Any application linking to QtNetwork, QtWebKit, or QtDeclarative is
likely to utilize network, so add NetworkServices capabiltity for
these applications by default in Symbian. Also increased the default
epocheap maximum size for these applications.
Task-number: QTBUG-14472
Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index afc708a..59d49c6 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -49,16 +49,23 @@ defineTest(qtAddLibrary) { isEqual(LIB_NAME, QtGui) { # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE - } - isEqual(LIB_NAME, QtWebKit) { + } else:isEqual(LIB_NAME, QtWebKit) { # Needed for because relative inclusion problem in toolchain INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork - } - isEqual(LIB_NAME, QtXmlPatterns) { + TARGET.CAPABILITY *= NetworkServices + isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + } else:isEqual(LIB_NAME, QtXmlPatterns) { # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork + } else:isEqual(LIB_NAME, QtNetwork) { + TARGET.CAPABILITY *= NetworkServices + } else:isEqual(LIB_NAME, QtDeclarative) { + TARGET.CAPABILITY *= NetworkServices + isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } + export(TARGET.EPOCHEAPSIZE) + export(TARGET.CAPABILITY) } isEmpty(LINKAGE) { if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |