summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-09-27 14:14:11 (GMT)
committerPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-10-13 07:21:40 (GMT)
commitfe5f996eac2a4b4e7e704f7cdaebe990a76c6034 (patch)
treec08bdaad66c45a8115d08b976cf1a282d63d5a8f
parent2299f684f0ca6bdf49128b17c49488ae27b49479 (diff)
downloadQt-fe5f996eac2a4b4e7e704f7cdaebe990a76c6034.zip
Qt-fe5f996eac2a4b4e7e704f7cdaebe990a76c6034.tar.gz
Qt-fe5f996eac2a4b4e7e704f7cdaebe990a76c6034.tar.bz2
Put Qt translation files to rom on Symbian.
Task-Number: QTBUG-4919 Reviewed-by: Honglei Zhang
-rw-r--r--config.profiles/symbian/platform_paths.prf13
-rw-r--r--src/s60installs/qt_resources.iby11
-rwxr-xr-xsrc/s60installs/s60installs.pro1
3 files changed, 25 insertions, 0 deletions
diff --git a/config.profiles/symbian/platform_paths.prf b/config.profiles/symbian/platform_paths.prf
index 0e2131f..1769885 100644
--- a/config.profiles/symbian/platform_paths.prf
+++ b/config.profiles/symbian/platform_paths.prf
@@ -239,10 +239,23 @@ defineReplace(CORE_TOOLS_LAYER_IBY_EXPORT_PATH) {
defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
return(/epoc32/rom/include/$$1)
}
+
+defineReplace(LANGUAGE_APP_LAYER_IBY_EXPORT_PATH) {
+ return(/epoc32/rom/include/language/app/$$1)
+}
+defineReplace(LANGUAGE_MW_LAYER_IBY_EXPORT_PATH) {
+ return(/epoc32/rom/include/language/mw/$$1)
+}
+defineReplace(LANGUAGE_OS_LAYER_IBY_EXPORT_PATH) {
+ return(/epoc32/rom/include/language/os/$$1)
+}
+
defineReplace(CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH) {
return(/epoc32/rom/include/customervariant/app/$$1)
}
+
+
# You need to define the following in pro-file, if you are using the stllib:
# QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
# DEFINES *= $$STLLIB_USAGE_DEFINES
diff --git a/src/s60installs/qt_resources.iby b/src/s60installs/qt_resources.iby
new file mode 100644
index 0000000..f5fe1c4
--- /dev/null
+++ b/src/s60installs/qt_resources.iby
@@ -0,0 +1,11 @@
+#ifndef QT_RESOURCES_IBY
+#define QT_RESOURCES_IBY
+
+#include <data_caging_paths_for_iby.hrh>
+
+// Localisation files
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\qt.qm QT_TRANSLATIONS_DIR\qt.qm
+
+#endif // __QT_RESOURCES_IBY__
+
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index c2b462c..08c4829 100755
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -175,4 +175,5 @@ symbian: {
}
BLD_INF_RULES.prj_exports += "$$S60_INSTALLS_SOURCE_DIR/qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+ BLD_INF_RULES.prj_exports += "$$S60_INSTALLS_SOURCE_DIR/qt_resources.iby $$LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(qt_resources.iby)"
}