diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-16 14:21:16 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-16 14:30:24 (GMT) |
| commit | 130f8dce2f730811c3f1f0b4f45a3333c9a79600 (patch) | |
| tree | 817744b4416c1d713d21413aaa546abeb1a6f3d4 | |
| parent | 1163032eda2dce89bd464d2a99f3cbbcf20cc232 (diff) | |
| download | Qt-130f8dce2f730811c3f1f0b4f45a3333c9a79600.zip Qt-130f8dce2f730811c3f1f0b4f45a3333c9a79600.tar.gz Qt-130f8dce2f730811c3f1f0b4f45a3333c9a79600.tar.bz2 | |
Fix mismatched $$translations handling after merge
One use of $$translations prepends "$$_PRO_FILE_PWD_/" to it in
symbian.conf, while another identical use doesn't. This discrepancy
was caused by merge from 4.7.
Reviewed-by: Janne Koskinen
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index e3813a4..d9f6279 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -260,7 +260,7 @@ defineTest(matchSymbianLanguages) { HANDLED_LANGUAGES += $$strippedLanguage SYMBIAN_UNMAPPED_LANGUAGES += $$language SYMBIAN_MATCHED_LANGUAGES += $$language - SYMBIAN_MATCHED_TRANSLATIONS += $$translation + SYMBIAN_MATCHED_TRANSLATIONS += $$_PRO_FILE_PWD_/$$translation SYMBIAN_LANGUAGE_FALLBACK.$$language = $$strippedLanguage export(SYMBIAN_LANGUAGE_FALLBACK.$$language) } |