diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 10:02:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 10:02:23 (GMT) |
| commit | 03dc74984749adf5b11482bf871a47086217845c (patch) | |
| tree | 58eaa299c0d87d6d678fe635fddaab42177328cf /tools | |
| parent | dfd7c876263310c03d8b64033749efe2b6b1e081 (diff) | |
| parent | 0cd433404210fdaa6b21a98ef5768c9b761ed024 (diff) | |
| download | Qt-03dc74984749adf5b11482bf871a47086217845c.zip Qt-03dc74984749adf5b11482bf871a47086217845c.tar.gz Qt-03dc74984749adf5b11482bf871a47086217845c.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 1 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qscript.g | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 1715b79..6e3ab5c 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -651,6 +651,7 @@ int main(int argc, char **argv) } } else { sourceFiles << QDir::cleanPath(fi.absoluteFilePath());; + projectRoots.insert(fi.absolutePath() + QLatin1Char('/')); } } numFiles++; diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index a07753c..857c58a 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -108,7 +108,7 @@ static void recordMessage( fileName, lineNo, QStringList(), TranslatorMessage::Unfinished, plural); msg.setExtraComment(extracomment.simplified()); - tor->replace(msg); + tor->extend(msg); } |