summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-20 09:41:11 (GMT)
committeraxis <qt-info@nokia.com>2011-01-27 13:26:04 (GMT)
commit8ee75222533fd5be30f9f21d609a9595519d5b94 (patch)
treedebb565b57f7fae7a3d90265d4a9bbd7ac5c88f6 /qmake
parentf5a618d86395f35ced1b847581e48994e9196a32 (diff)
downloadQt-8ee75222533fd5be30f9f21d609a9595519d5b94.zip
Qt-8ee75222533fd5be30f9f21d609a9595519d5b94.tar.gz
Qt-8ee75222533fd5be30f9f21d609a9595519d5b94.tar.bz2
Added Symbian deployment localization for makefile build system.
This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symbiancommon.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 8747f5a..4943a74 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -405,8 +405,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile,
t << manufacturerStr << endl;
}
- // ### FIXME: remove epocBuild check once makefile based mkspecs support localized resource generation
- if (epocBuild && symbianLocalizationList.size()) {
+ if (symbianLocalizationList.size()) {
// Add localized resources to DEPLOYMENT if default resource deployment is done
addLocalizedResourcesToDeployment("default_resource_deployment.files", symbianLocalizationList);
addLocalizedResourcesToDeployment("default_reg_deployment.files", symbianLocalizationList);