From 130f8dce2f730811c3f1f0b4f45a3333c9a79600 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 16 Mar 2011 16:21:16 +0200
Subject: 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
---
mkspecs/common/symbian/symbian.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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)
}
--
cgit v0.12