diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-04 16:20:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-23 00:24:51 +0000 |
| commit | 5c6201f6c393967e9284bb9841281d286126541d (patch) | |
| tree | 24339c13b833cae3d8f6f0115bade06df342b9fc /src/tools/qwebengine_convert_dict | |
| parent | f3f3279bec367bf3816377ac31a75c042648068f (diff) | |
Adaptations for Chromium 72
Change-Id: Ic355257066c7c1433862cb41e6f2bfa831147e0d
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/tools/qwebengine_convert_dict')
| -rw-r--r-- | src/tools/qwebengine_convert_dict/main.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 2 |
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). |