From 5c6201f6c393967e9284bb9841281d286126541d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 4 Feb 2019 16:20:37 +0100 Subject: Adaptations for Chromium 72 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic355257066c7c1433862cb41e6f2bfa831147e0d Reviewed-by: Jüri Valdmann --- src/tools/qwebengine_convert_dict/main.cpp | 4 +++- src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/tools/qwebengine_convert_dict') 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 expectedAffixes(org_words[i].second); base::span 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). -- cgit v1.2.3