Commit 7a241aa7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

QString::split(..., Qt::SplitBehavior, ...) is already in Qt 5.14

parent 44439dfa
Pipeline #47732 passed with stage
in 10 minutes and 14 seconds
......@@ -206,11 +206,7 @@ KConfigBasedKeyFilter::KConfigBasedKeyFilter(const KConfigGroup &config)
{ "appearance", Appearance },
{ "filtering", Filtering },
};
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList contexts = config.readEntry("match-contexts", "any").toLower().split(QRegExp(QLatin1String("[^a-zA-Z0-9_-!]+")), QString::SkipEmptyParts);
#else
const QStringList contexts = config.readEntry("match-contexts", "any").toLower().split(QRegExp(QLatin1String("[^a-zA-Z0-9_-!]+")), Qt::SkipEmptyParts);
#endif
setMatchContexts(NoMatchContext);
for (const QString & ctx : contexts) {
bool found = false;
......
......@@ -959,11 +959,7 @@ Kleo::CryptoConfigEntryKeyserver::CryptoConfigEntryKeyserver(
Kleo::ParsedKeyserver Kleo::parseKeyserver(const QString &str)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList list = str.split(QRegExp(QLatin1String("[\\s,]")), QString::SkipEmptyParts);
#else
const QStringList list = str.split(QRegExp(QLatin1String("[\\s,]")), Qt::SkipEmptyParts);
#endif
if (list.empty()) {
return Kleo::ParsedKeyserver();
}
......
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