Commit 7ae13f7c authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile against qt5.15. SkipEmptyParts is part of Qt::.

parent b3d99646
...@@ -560,7 +560,11 @@ void KQuery::setRegExp(const QString &regexp, bool caseSensitive) ...@@ -560,7 +560,11 @@ void KQuery::setRegExp(const QString &regexp, bool caseSensitive)
{ {
QRegExp *regExp = nullptr; QRegExp *regExp = nullptr;
QRegExp sep(QStringLiteral(";")); QRegExp sep(QStringLiteral(";"));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList strList = regexp.split(sep, QString::SkipEmptyParts); const QStringList strList = regexp.split(sep, QString::SkipEmptyParts);
#else
const QStringList strList = regexp.split(sep, Qt::SkipEmptyParts);
#endif
// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE); // QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
while (!m_regexps.isEmpty()) { while (!m_regexps.isEmpty()) {
delete m_regexps.takeFirst(); delete m_regexps.takeFirst();
...@@ -610,7 +614,11 @@ void KQuery::slotendProcessLocate(int code, QProcess::ExitStatus) ...@@ -610,7 +614,11 @@ void KQuery::slotendProcessLocate(int code, QProcess::ExitStatus)
if (!bufferLocate.isEmpty()) { if (!bufferLocate.isEmpty()) {
QString str = QString::fromLocal8Bit(bufferLocate); QString str = QString::fromLocal8Bit(bufferLocate);
bufferLocate.clear(); bufferLocate.clear();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
slotListEntries(str.split(QLatin1Char('\n'), QString::SkipEmptyParts)); slotListEntries(str.split(QLatin1Char('\n'), QString::SkipEmptyParts));
#else
slotListEntries(str.split(QLatin1Char('\n'), Qt::SkipEmptyParts));
#endif
} }
} }
emit result(0); emit result(0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment