Commit f788453b authored by Volker Krause's avatar Volker Krause
Browse files

Require Qt 5.15

Everything below and above us does that already anyway, so do this here
too and ensure we aren't accidentally using obsolete API.
parent 56ac7e1d
Pipeline #57091 passed with stage
in 23 seconds
......@@ -33,10 +33,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KPUBLICTRANSPORT
SOVERSION 1
)
find_package(Qt5 5.11 REQUIRED COMPONENTS Quick)
find_package(Qt5 5.15 REQUIRED COMPONENTS Quick)
if (BUILD_TESTING)
find_package(Qt5 5.11 REQUIRED COMPONENTS Test Widgets)
find_package(Qt5 5.15 REQUIRED COMPONENTS Test Widgets)
endif()
find_package(ZLIB REQUIRED)
......@@ -49,7 +49,7 @@ if (NOT WIN32)
endif()
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
endif()
......
......@@ -146,11 +146,7 @@ struct {
static QStringList splitAndNormalizeName(const QString &name)
{
static const QRegularExpression splitRegExp(QStringLiteral(R"([, \(\)-/\.\[\]])"));
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
auto l = name.split(splitRegExp, QString::SkipEmptyParts);
#else
auto l = name.split(splitRegExp, Qt::SkipEmptyParts);
#endif
for (auto it = l.begin(); it != l.end();) {
// ignore single-letter fragments, with the exception of the 'H' used in Denmark
......
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