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-03-04 10:30:36 (GMT)
commit2ad80c0149477a6ca7dd69a7243c2055d208c98d (patch)
tree43450bd02ded2a68259cc9284c43a20fd19ae439 /qmake
parentb83cbadc80b24107433709f4827e1619a0e7561b (diff)
downloadQt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.zip
Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.tar.gz
Qt-2ad80c0149477a6ca7dd69a7243c2055d208c98d.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 96d7725..c0afaaf 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -394,8 +394,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.sources", symbianLocalizationList);
addLocalizedResourcesToDeployment("default_reg_deployment.sources", symbianLocalizationList);