From 7ae13f7cc77d102c5f0a9fd6853ce2051a997e8f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 3 Mar 2020 13:35:34 +0100 Subject: [PATCH] Make it compile against qt5.15. SkipEmptyParts is part of Qt::. --- src/kquery.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/kquery.cpp b/src/kquery.cpp index f735ea53d..fae827c29 100644 --- a/src/kquery.cpp +++ b/src/kquery.cpp @@ -560,7 +560,11 @@ void KQuery::setRegExp(const QString ®exp, bool caseSensitive) { QRegExp *regExp = nullptr; QRegExp sep(QStringLiteral(";")); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) const QStringList strList = regexp.split(sep, QString::SkipEmptyParts); +#else + const QStringList strList = regexp.split(sep, Qt::SkipEmptyParts); +#endif // QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE); while (!m_regexps.isEmpty()) { delete m_regexps.takeFirst(); @@ -610,7 +614,11 @@ void KQuery::slotendProcessLocate(int code, QProcess::ExitStatus) if (!bufferLocate.isEmpty()) { QString str = QString::fromLocal8Bit(bufferLocate); bufferLocate.clear(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) slotListEntries(str.split(QLatin1Char('\n'), QString::SkipEmptyParts)); +#else + slotListEntries(str.split(QLatin1Char('\n'), Qt::SkipEmptyParts)); +#endif } } emit result(0); -- GitLab