tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

suppress qt deprecation warnings

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-07-13 13:49:49 +02:00
parent 5915dd6cea
commit 8f0d3cbac5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qtgui/preview_w.cpp
View File

@ -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)

7
src/qtgui/reslist.cpp
View File

@ -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) {