diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 17:36:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 17:36:36 (GMT) |
| commit | 95cd3aca76a47d59ef43e7c1566e5d43ab8b7c30 (patch) | |
| tree | 0935915e89ed396cd4f33c553857d84ab39d95b7 /mkspecs | |
| parent | 0ca404def7262ad7293592bbb7888a6df5ea27b7 (diff) | |
| parent | c1bbcda2cdd70d2a7a615bf823c55520914b90f5 (diff) | |
| download | Qt-95cd3aca76a47d59ef43e7c1566e5d43ab8b7c30.zip Qt-95cd3aca76a47d59ef43e7c1566e5d43ab8b7c30.tar.gz Qt-95cd3aca76a47d59ef43e7c1566e5d43ab8b7c30.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
QNAM HTTP: Fix bug with explicitly zero-length compressed responses.
Add enablers for Symbian App Booster
Don't rely on uninitialized data
Don't realloc user-provided buffer
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/template.applite | 1 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_appbooster.prf | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/template.applite b/mkspecs/common/symbian/template.applite new file mode 100644 index 0000000..73a1999 --- /dev/null +++ b/mkspecs/common/symbian/template.applite @@ -0,0 +1 @@ +// This is an auto-generated lite registration file
\ No newline at end of file diff --git a/mkspecs/features/symbian/symbian_appbooster.prf b/mkspecs/features/symbian/symbian_appbooster.prf new file mode 100644 index 0000000..080f4d0 --- /dev/null +++ b/mkspecs/features/symbian/symbian_appbooster.prf @@ -0,0 +1,32 @@ +contains(TEMPLATE, ".*app") { + baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET)) + + symbian-abld|symbian-sbsv2 { + LITE_REG_TARGET = $$_PRO_FILE_PWD_ + } else { + contains(DESTDIR, "/.*") { + LITE_REG_TARGET = $$DESTDIR + } else:isEmpty(DESTDIR) { + LITE_REG_TARGET = $$OUT_PWD + } else { + LITE_REG_TARGET = $$OUT_PWD/$$DESTDIR + } + } + + LITE_REG_TARGET = $${LITE_REG_TARGET}/$${baseTarget}.applite + LITE_REG_TEMPLATE = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/template.applite + + lite_reg_copy.input = LITE_REG_TEMPLATE + lite_reg_copy.output = $$LITE_REG_TARGET + lite_reg_copy.variable_out = PRE_TARGETDEPS + lite_reg_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + lite_reg_copy.CONFIG += no_link + QMAKE_EXTRA_COMPILERS += lite_reg_copy + + isEmpty(LITE_IMPORT_DIR): LITE_IMPORT_DIR = /private/20034884/import/apps + lite_deployment.sources += $$LITE_REG_TARGET + lite_deployment.path = $$LITE_IMPORT_DIR + DEPLOYMENT += lite_deployment + + LIBS += -lqDeclarativeBooster.dll +} |