diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 15:23:22 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-16 15:23:22 +0100 |
| commit | b60fd7ade323e04da02d6ffd235272d19fa7076d (patch) | |
| tree | 8310cef559521c4bebf640c3e275a354f675c4b8 /src/linguist/shared/po.cpp | |
| parent | 95907799089ef34a0250bddfa1c5d6027ee996b8 (diff) | |
| parent | 638c278b76c56a51f83ef8c5cc9c03f18a887f74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
Change-Id: Icd2e3843fbf9906454e8e3aa3ac46b21bae3c306
Diffstat (limited to 'src/linguist/shared/po.cpp')
| -rw-r--r-- | src/linguist/shared/po.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp index cc9c35980..a24fdcc66 100644 --- a/src/linguist/shared/po.cpp +++ b/src/linguist/shared/po.cpp @@ -162,7 +162,7 @@ static QString poEscapedLines(const QString &prefix, bool addSpace, const QStrin static QString poWrappedEscapedLines(const QString &prefix, bool addSpace, const QString &line) { - const int maxlen = MAX_LEN - prefix.length(); + const int maxlen = MAX_LEN - prefix.length() - addSpace; QStringList lines; int off = 0; while (off + maxlen < line.length()) { |