INCLUDEPATH = FOO $$INCLUDEPATH triggered an infinte loop

backport the fix from Qt3.3 for that issue
Add alternative mode to only generate one language...

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,6 +1,6 @@
 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
@@ -15,10 +15,12 @@ OPIE* OPIE::self() {
     if (!m_self ) m_self = new OPIE;
     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;
     langs = dir.entryList( QDir::Dirs );
@@ -30,8 +32,9 @@ QStringList OPIE::languageList( const QString& _opieDir )const {
 
 
 
     return langs;
+#endif    
 }
 QString OPIE::opieDir( const QString& _opieDir ) const{
     if (!_opieDir.isEmpty() ) return _opieDir;
     char* dir = ::getenv("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
@@ -134,8 +134,9 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
             }else {
 		if ( tagMap.contains(invocation) )
 		    after = tagMap[invocation];
 		(*it).replace( i, len, after );
+		i += after.length();
 	    }
 	}
     }