diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:34 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:34 +0100 |
commit | 28811dad02f18a3dc0eeae9d91cd4819780626ee (patch) | |
tree | 7ced78142ce3f8815df7082f25a83048dd0d855f /src/linguist/shared/po.cpp | |
parent | 94c0fd2b718332f9307b6de4e3863540612aed54 (diff) | |
parent | 782a097d8950dca2620a8952856864ede62b0b59 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iff33dc736e4844af2c1c8e227ef1145d77fc1d85
Diffstat (limited to 'src/linguist/shared/po.cpp')
-rw-r--r-- | src/linguist/shared/po.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp index 19ba12b96..69062b772 100644 --- a/src/linguist/shared/po.cpp +++ b/src/linguist/shared/po.cpp @@ -548,7 +548,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) QString xrefs; foreach (const QString &ref, codec->toUnicode(item.references).split( - QRegExp(QLatin1String("\\s")), QString::SkipEmptyParts)) { + QRegExp(QLatin1String("\\s")), Qt::SkipEmptyParts)) { int pos = ref.indexOf(QLatin1Char(':')); int lpos = ref.lastIndexOf(QLatin1Char(':')); if (pos != -1 && pos == lpos) { @@ -607,7 +607,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) case ',': { QStringList flags = QString::fromLatin1(line.mid(2)).split( - QRegExp(QLatin1String("[, ]")), QString::SkipEmptyParts); + QRegExp(QLatin1String("[, ]")), Qt::SkipEmptyParts); if (flags.removeOne(QLatin1String("fuzzy"))) item.isFuzzy = true; flags.removeOne(QLatin1String("qt-format")); @@ -750,7 +750,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &) out << "msgid \"\"\n"; Translator::ExtraData headers = translator.extras(); QStringList hdrOrder = translator.extra(QLatin1String("po-headers")).split( - QLatin1Char(','), QString::SkipEmptyParts); + QLatin1Char(','), Qt::SkipEmptyParts); // Keep in sync with loadPO addPoHeader(headers, hdrOrder, "MIME-Version", QLatin1String("1.0")); addPoHeader(headers, hdrOrder, "Content-Type", |