diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-02-21 13:38:24 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-02-21 14:15:39 (GMT) |
| commit | 2d4298854ba57667a8aa0a0dd3a4bd7ce41aceae (patch) | |
| tree | 59ac285337e0df2377c134c7c9c78255088414bb /mkspecs/features | |
| parent | 3196c9e64dc3d966547bd0b38c440e55eb913479 (diff) | |
| download | Qt-2d4298854ba57667a8aa0a0dd3a4bd7ce41aceae.zip Qt-2d4298854ba57667a8aa0a0dd3a4bd7ce41aceae.tar.gz Qt-2d4298854ba57667a8aa0a0dd3a4bd7ce41aceae.tar.bz2 | |
Only add NetworkServices capability automatically if no caps are set.
This allows overriding the NetworkServices capability for the
applications that do not need the capability even though they link
network, webkit, or declarative. It is also more intuitive as there
are no magic additions to user defined capabilities.
Task-number: QTBUG-17540
Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 964e13b..24c84a5 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -53,15 +53,15 @@ defineTest(qtAddLibrary) { # Needed for because relative inclusion problem in toolchain INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork - TARGET.CAPABILITY *= NetworkServices + isEmpty(TARGET.CAPABILITY): 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 + isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices } else:isEqual(LIB_NAME, QtDeclarative) { - TARGET.CAPABILITY *= NetworkServices + isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } export(TARGET.EPOCHEAPSIZE) |