diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-04-04 11:58:24 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-04-04 12:28:18 +0300 |
| commit | ae99d577f788d57a3f4a37ee300872556c57b77c (patch) | |
| tree | b13f0afe1304d49676518962b719c5b03d974197 /mkspecs | |
| parent | e708c337a7856195bb567746f028112fdb4de515 (diff) | |
| download | qt4-tools-ae99d577f788d57a3f4a37ee300872556c57b77c.tar.gz | |
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
If the path to translation file is already absolute, do not add
the $$_PRO_FILE_PWD_ to it in symbian.conf
Task-number: QT-4842
Reviewed-by: axis
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 117f332aa1..e35786b732 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) } |