From 8f0d3cbac511e4a8955a1686bc41e6d74a6fd3d8 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 13 Jul 2020 13:49:49 +0200 Subject: [PATCH] suppress qt deprecation warnings --- src/qtgui/preview_w.cpp | 3 ++- src/qtgui/reslist.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qtgui/preview_w.cpp b/src/qtgui/preview_w.cpp index 852a9493..001b06c7 100644 --- a/src/qtgui/preview_w.cpp +++ b/src/qtgui/preview_w.cpp @@ -354,7 +354,8 @@ void Preview::doSearch(const QString &_text, bool next, bool reverse, } Chrono chron; LOGDEB("Preview::doSearch: first find call\n"); - QTextDocument::FindFlags flags = 0; + // FindFlags is a QFlags class with default constructor to empty. + QTextDocument::FindFlags flags; if (reverse) flags |= QTextDocument::FindBackward; if (wordOnly) diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index 3c9528b5..70faf119 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -1080,7 +1080,12 @@ void ResList::onPopupJsDone(const QVariant &jr) { QString qs(jr.toString()); LOGDEB("onPopupJsDone: parameter: " << qs2utf8s(qs) << "\n"); - QStringList qsl = qs.split("\n", QString::SkipEmptyParts); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) + auto skipflags = Qt::SkipEmptyParts; +#else + auto skipflags = QString::SkipEmptyParts; +#endif + QStringList qsl = qs.split("\n", skipflags); for (int i = 0 ; i < qsl.size(); i++) { int eq = qsl[i].indexOf("="); if (eq > 0) {