diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 12:45:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 12:45:27 (GMT) |
| commit | 22f285ac93bde36d0d965f72cd56b6173e88c6e2 (patch) | |
| tree | 41fa12b2b3bc85307b31a168fd1a0b47f6e8713d /mkspecs | |
| parent | 7418c05b7534b1e3aa014b420081d2f94b1ac0d2 (diff) | |
| parent | eb20a7341827b5590fbd891ca1b82ea7ba37d679 (diff) | |
| download | Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.zip Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.tar.gz Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QGradient stop with NaN position on Symbian.
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
QApplication does not define flag for "single touch"
Native dialog softkeys are covered by QApplication softkeys
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 117f332..e35786b 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -241,9 +241,12 @@ defineTest(matchSymbianLanguages) { language = $$replace(translation, "^(.*/)?[^/]+_(([^_]{2,3}_)?[^_]{2,3})\\.ts$", \\2) !contains(HANDLED_LANGUAGES, $$language) { HANDLED_LANGUAGES += $$language + # Make sure translation path is absolute or shadow builds will not work + !contains(translation, "(^/|^\\\\|^.:).*"): translation = $$_PRO_FILE_PWD_/$$translation + contains(SYMBIAN_SUPPORTED_LANGUAGES, $$language) { SYMBIAN_MATCHED_LANGUAGES += $$language - SYMBIAN_MATCHED_TRANSLATIONS += $$_PRO_FILE_PWD_/$$translation + SYMBIAN_MATCHED_TRANSLATIONS += $$translation } else { # No direct mapping for specified language found. Check if a fallback language code can be used. strippedLanguage = $$replace(language, "_.*$",) @@ -251,7 +254,7 @@ defineTest(matchSymbianLanguages) { HANDLED_LANGUAGES += $$strippedLanguage SYMBIAN_UNMAPPED_LANGUAGES += $$language SYMBIAN_MATCHED_LANGUAGES += $$language - SYMBIAN_MATCHED_TRANSLATIONS += $$_PRO_FILE_PWD_/$$translation + SYMBIAN_MATCHED_TRANSLATIONS += $$translation SYMBIAN_LANGUAGE_FALLBACK.$$language = $$strippedLanguage export(SYMBIAN_LANGUAGE_FALLBACK.$$language) } |