From ab010081c21f097e436c54ef8786f9abdf764790 Mon Sep 17 00:00:00 2001 From: zecke Date: Wed, 07 Jul 2004 15:18:14 +0000 Subject: INCLUDEPATH = FOO $$INCLUDEPATH triggered an infinte loop backport the fix from Qt3.3 for that issue Add alternative mode to only generate one language... --- (limited to 'development') 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,5 +1,5 @@ TEMPLATE = app -CONFIG += qt warn_on console +CONFIG += qt warn_on console thread HEADERS = ../shared/metatranslator.h \ ../shared/proparser.h \ ../shared/opie.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 @@ -16,8 +16,10 @@ OPIE* OPIE::self() { return m_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; QDir dir( opieDi + "/i18n/"); if (!dir.exists() ) return langs; @@ -31,6 +33,7 @@ QStringList OPIE::languageList( const QString& _opieDir )const { return langs; +#endif } QString OPIE::opieDir( const QString& _opieDir ) const{ if (!_opieDir.isEmpty() ) return _opieDir; 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 @@ -135,6 +135,7 @@ QMap proFileTagMap( const QString& text, const QString& opieDi if ( tagMap.contains(invocation) ) after = tagMap[invocation]; (*it).replace( i, len, after ); + i += after.length(); } } } -- cgit v0.9.0.2