Bump minimum Qt version

There's no need to drop Qt 5 just yet, but we should require the latest
version.

Change-Id: I2653ef5c3c244453db88a48d59e2c86eb38518b5
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 0648d399d..2befc8db8 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -298,7 +298,7 @@ void TestBlackbox::textTemplate()
 
 static QStringList sortedFileList(const QByteArray &ba)
 {
-    auto list = QString::fromUtf8(ba).split(QRegularExpression("[\r\n]"), QBS_SKIP_EMPTY_PARTS);
+    auto list = QString::fromUtf8(ba).split(QRegularExpression("[\r\n]"), Qt::SkipEmptyParts);
     std::sort(list.begin(), list.end());
     return list;
 }
@@ -698,7 +698,7 @@ void TestBlackbox::buildDirectories()
     QDir::setCurrent(projectDir);
     QCOMPARE(runQbs(), 0);
     const QStringList outputLines
-            = QString::fromLocal8Bit(m_qbsStdout.trimmed()).split('\n', QBS_SKIP_EMPTY_PARTS);
+            = QString::fromLocal8Bit(m_qbsStdout.trimmed()).split('\n', Qt::SkipEmptyParts);
     QVERIFY2(outputLines.contains(projectDir + '/' + relativeProductBuildDir("p1")),
              m_qbsStdout.constData());
     QVERIFY2(outputLines.contains(projectDir + '/' + relativeProductBuildDir("p2")),
@@ -3827,7 +3827,7 @@ void TestBlackbox::emptyProfile()
                 QDir::toNativeSeparators(
                         buildProfile.value(QStringLiteral("cpp.toolchainInstallPath")).toString());
         auto paths = params.environment.value(QStringLiteral("PATH"))
-                .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+                .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
         if (!tcPath.isEmpty() && !paths.contains(tcPath)) {
             paths.prepend(tcPath);
             params.environment.insert(
@@ -7436,7 +7436,7 @@ static bool haveMakeNsis()
             << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS");
 
     QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH")
-            .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+            .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
 
     for (const QString &key : std::as_const(regKeys)) {
         QSettings settings(key, QSettings::NativeFormat);
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index fdb656c72..02b56f603 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -1131,7 +1131,7 @@ void TestBlackboxApple::xcode()
     QVERIFY2(xcodebuildShowSdks.exitCode() == 0,
              qPrintable(xcodebuildShowSdks.readAllStandardError().constData()));
     const auto lines = QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed())
-            .split('\n', QBS_SKIP_EMPTY_PARTS);
+            .split('\n', Qt::SkipEmptyParts);
     for (const QString &line : lines) {
         static const std::regex regexp("^.+\\s+\\-sdk\\s+([a-z]+)([0-9]+\\.[0-9]+)$");
         const auto ln = line.toStdString();
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp
index 8e85640db..17652e779 100644
--- a/tests/auto/blackbox/tst_blackboxbase.cpp
+++ b/tests/auto/blackbox/tst_blackboxbase.cpp
@@ -221,7 +221,7 @@ void TestBlackboxBase::validateTestProfile()
 QString TestBlackboxBase::findExecutable(const QStringList &fileNames)
 {
     const QStringList path = QString::fromLocal8Bit(qgetenv("PATH"))
-            .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+            .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
 
     for (const QString &fileName : fileNames) {
         QFileInfo fi(fileName);
diff --git a/tests/auto/blackbox/tst_blackboxwindows.cpp b/tests/auto/blackbox/tst_blackboxwindows.cpp
index 1c487bc52..57bd7f947 100644
--- a/tests/auto/blackbox/tst_blackboxwindows.cpp
+++ b/tests/auto/blackbox/tst_blackboxwindows.cpp
@@ -228,7 +228,7 @@ static bool haveWiX(const Profile &profile)
             << QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Installer XML\\");
 
     QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH")
-            .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+            .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
 
     for (const QString &key : std::as_const(regKeys)) {
         const QStringList versions = QSettings(key, QSettings::NativeFormat).childGroups();