summaryrefslogtreecommitdiff
path: root/development/translation
authorzecke <zecke>2004-07-07 15:18:14 (UTC)
committer zecke <zecke>2004-07-07 15:18:14 (UTC)
commitab010081c21f097e436c54ef8786f9abdf764790 (patch) (side-by-side diff)
tree36934a2aecd6e898c09d3414764efce0e2777915 /development/translation
parentd6ed7f967feb423a91a5c6ea94d54001b33bcd77 (diff)
downloadopie-ab010081c21f097e436c54ef8786f9abdf764790.zip
opie-ab010081c21f097e436c54ef8786f9abdf764790.tar.gz
opie-ab010081c21f097e436c54ef8786f9abdf764790.tar.bz2
INCLUDEPATH = FOO $$INCLUDEPATH triggered an infinte loop
backport the fix from Qt3.3 for that issue Add alternative mode to only generate one language...
Diffstat (limited to 'development/translation') (more/less context) (show whitespace changes)
-rw-r--r--development/translation/opie-lupdate/opie-lupdate.pro2
-rw-r--r--development/translation/shared/opie.cpp5
-rw-r--r--development/translation/shared/proparser.cpp1
3 files changed, 6 insertions, 2 deletions
diff --git a/development/translation/opie-lupdate/opie-lupdate.pro b/development/translation/opie-lupdate/opie-lupdate.pro
index ea51c8b..8360f05 100644
--- a/development/translation/opie-lupdate/opie-lupdate.pro
+++ b/development/translation/opie-lupdate/opie-lupdate.pro
@@ -1,3 +1,3 @@
TEMPLATE = app
-CONFIG += qt warn_on console
+CONFIG += qt warn_on console thread
HEADERS = ../shared/metatranslator.h \
diff --git a/development/translation/shared/opie.cpp b/development/translation/shared/opie.cpp
index c5c72d1..c8cea42 100644
--- a/development/translation/shared/opie.cpp
+++ b/development/translation/shared/opie.cpp
@@ -18,4 +18,6 @@ OPIE* OPIE::self() {
QStringList OPIE::languageList( const QString& _opieDir )const {
+#if 0
+ return QStringList::split(':',QString(::getenv("OPIE_CREATE_LANGS")));
+#else
QString opieDi = opieDir( _opieDir );
-
QStringList langs;
@@ -33,2 +35,3 @@ QStringList OPIE::languageList( const QString& _opieDir )const {
return langs;
+#endif
}
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp
index f616c5a..bb099bb 100644
--- a/development/translation/shared/proparser.cpp
+++ b/development/translation/shared/proparser.cpp
@@ -137,2 +137,3 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
(*it).replace( i, len, after );
+ i += after.length();
}