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,18 +1,18 @@
 TEMPLATE	= app
-CONFIG		+= qt warn_on console
+CONFIG		+= qt warn_on console thread
 HEADERS		= ../shared/metatranslator.h \
 		  ../shared/proparser.h \
 		  ../shared/opie.h
 		  
 SOURCES		= fetchtr.cpp \
 		  main.cpp \
 		  merge.cpp \
 		  numberh.cpp \
 		  sametexth.cpp \
 		  ../shared/metatranslator.cpp \
 		  ../shared/proparser.cpp \
 		  ../shared/opie.cpp
 
 DEFINES 	+= QT_INTERNAL_XML
 
 TARGET		= opie-lupdate
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
@@ -3,38 +3,41 @@
 #include <qdir.h>
 
 #include "opie.h"
 
 OPIE* OPIE::m_self = 0;
 
 
 OPIE::OPIE() {
 }
 OPIE::~OPIE() {
 }
 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 );
 
     langs.remove("CVS"); // hey this no language
     langs.remove("unmaintained"); // remove this one too
     langs.remove(".");
     langs.remove("..");
 
 
 
     return langs;
+#endif    
 }
 QString OPIE::opieDir( const QString& _opieDir ) const{
     if (!_opieDir.isEmpty() ) return _opieDir;
     char* dir = ::getenv("OPIEDIR");
     if (!dir ) return QString::null;
     return QString::fromLatin1(dir);
 }
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
@@ -122,32 +122,33 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
     for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
 	int i = 0;
 	while ( (i = var.search((*it), i)) != -1 ) {
 	    int len = var.matchedLength();
 	    QString invocation = var.cap(1);
 	    QString after;
 
 	    if ( invocation == "system" ) {
 		// skip system(); it will be handled in the next pass
 		++i;
 	    } else if ( invocation == "OPIEDIR") {
                 (*it).replace( i, len, opieDir );
             }else {
 		if ( tagMap.contains(invocation) )
 		    after = tagMap[invocation];
 		(*it).replace( i, len, after );
+		i += after.length();
 	    }
 	}
     }
 
     /*
       Execute system() calls.
     */
     QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" );
     for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
 	int i = 0;
 	while ( (i = callToSystem.search((*it), i)) != -1 ) {
 	    /*
 	      This code is stolen from qmake's project.cpp file.
 	      Ideally we would use the same parser, so we wouldn't
 	      have this code duplication.
 	    */