Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: Iab8e05beb7ede38bacaa35322d1f79cfc85cd470

2 files changed, 5 insertions, 1 deletions

diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp
index 9d3888ad6..1694dbcef 100644
--- a/src/tools/qwebengine_convert_dict/main.cpp
+++ b/src/tools/qwebengine_convert_dict/main.cpp
@@ -111,7 +111,9 @@ inline bool VerifyWords(const convert_dict::DicReader::WordList& org_words,
         base::span<const int> expectedAffixes(org_words[i].second);
         base::span<const int> actualAffixes(affix_ids, affix_matches);
 
-        if (expectedAffixes != actualAffixes) {
+        if (!std::equal(expectedAffixes.begin(), expectedAffixes.end(),
+                        actualAffixes.begin(), actualAffixes.end(),
+                        [](int a, int b) { return a == b; })) {
             out << "Affixes do not match!\n"
                 << "  Index:    " << i << "\n"
                 << "  Word:     " << QString::fromUtf8(buf) << "\n"
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
index ced90655e..27edd66d8 100644
--- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
+++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
@@ -39,6 +39,8 @@ SOURCES += \
 
 QMAKE_TARGET_DESCRIPTION = "Qt WebEngine Dictionary Converter"
 
+CONFIG += c++14
+
 # Support converting dictionaries in a prefix build, by supplying
 # the path to the ICU data file located in the Qt build path, rather
 # than the install path (which is not present at build time).