| author | zecke <zecke> | 2004-07-07 15:18:14 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-07-07 15:18:14 (UTC) |
| commit | ab010081c21f097e436c54ef8786f9abdf764790 (patch) (side-by-side diff) | |
| tree | 36934a2aecd6e898c09d3414764efce0e2777915 /development | |
| parent | d6ed7f967feb423a91a5c6ea94d54001b33bcd77 (diff) | |
| download | opie-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...
| -rw-r--r-- | development/translation/opie-lupdate/opie-lupdate.pro | 2 | ||||
| -rw-r--r-- | development/translation/shared/opie.cpp | 5 | ||||
| -rw-r--r-- | development/translation/shared/proparser.cpp | 1 |
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,8 +1,8 @@ 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 \ 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 @@ -13,14 +13,16 @@ 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 @@ -28,12 +30,13 @@ QStringList OPIE::languageList( const QString& _opieDir )const { 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 @@ -132,12 +132,13 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi } 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. |