diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 22:26:54 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 22:26:54 +0100 |
| commit | 9748269cb58266fdfdac2c8820dad8c473dcf512 (patch) | |
| tree | 81cdd7830afb6507429594e133e18ca9f420dd8c /tools/linguist/lupdate/merge.cpp | |
| parent | 9a33a0027883ab77c10d8a9d9d9df5b4c2c5d50b (diff) | |
| parent | ba25c4a832516124bcd97758de9eede32797c5a0 (diff) | |
Merge branch '4.5'
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
Diffstat (limited to 'tools/linguist/lupdate/merge.cpp')
| -rw-r--r-- | tools/linguist/lupdate/merge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp index 46140dec7e..c4f44481b8 100644 --- a/tools/linguist/lupdate/merge.cpp +++ b/tools/linguist/lupdate/merge.cpp @@ -69,7 +69,7 @@ static int numberLength(const QString &s, int i) int pos = i; do { ++i; - } while (i < s.size() + } while (i < s.size() && (s.at(i).isDigit() || (isDigitFriendly(s[i]) && i + 1 < s.size() @@ -445,7 +445,7 @@ Translator merge(const Translator &tor, const Translator &virginTor, if (mv.sourceText().isEmpty()) { if (tor.contains(mv.context())) continue; - } else { + } else { if (tor.contains(mv.context(), mv.sourceText(), mv.comment())) continue; if (options & HeuristicSimilarText) { |