Use Qt::SplitBehavior in preference to QString::SplitBehavior

The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: I399b5ea56e9255e775ca1746632f7421519a6616
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index 42a4134e5f..0b8a84028f 100644
--- a/tests/auto/tools/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
@@ -176,7 +176,7 @@ void tst_rcc::rcc_data()
 }
 
 static QStringList readLinesFromFile(const QString &fileName,
-                                     QString::SplitBehavior splitBehavior)
+                                     Qt::SplitBehavior splitBehavior)
 {
     QFile file(fileName);
 
@@ -226,7 +226,7 @@ void tst_rcc::rcc()
     const QStringList actualLines = out.split(nl);
 
     const QStringList expectedLines =
-        readLinesFromFile(directory + QLatin1Char('/') + expected, QString::KeepEmptyParts);
+        readLinesFromFile(directory + QLatin1Char('/') + expected, Qt::KeepEmptyParts);
     QVERIFY(!expectedLines.isEmpty());
 
     const QString diff = doCompare(actualLines, expectedLines, directory);
@@ -238,7 +238,7 @@ static QStringMap readExpectedFiles(const QString &fileName)
 {
     QStringMap expectedFiles;
 
-    QStringList lines = readLinesFromFile(fileName, QString::SkipEmptyParts);
+    QStringList lines = readLinesFromFile(fileName, Qt::SkipEmptyParts);
     foreach (const QString &line, lines) {
         QString resourceFileName = line.section(QLatin1Char(' '), 0, 0, QString::SectionSkipEmpty);
         QString actualFileName = line.section(QLatin1Char(' '), 1, 1, QString::SectionSkipEmpty);
@@ -304,7 +304,7 @@ void tst_rcc::binary_data()
         QString localeFileName = absoluteBaseName + QLatin1String(".locale");
         QFile localeFile(localeFileName);
         if (localeFile.exists()) {
-            QStringList locales = readLinesFromFile(localeFileName, QString::SkipEmptyParts);
+            QStringList locales = readLinesFromFile(localeFileName, Qt::SkipEmptyParts);
             foreach (const QString &locale, locales) {
                 QString expectedFileName = QString::fromLatin1("%1.%2.%3").arg(absoluteBaseName, locale, QLatin1String("expected"));
                 QStringMap expectedFiles = readExpectedFiles(expectedFileName);
@@ -483,9 +483,9 @@ void tst_rcc::python()
     QVERIFY2(process.exitCode() == 0,
              msgProcessFailed(process).constData());
 
-    const auto actualLines = readLinesFromFile(actualFile, QString::KeepEmptyParts);
+    const auto actualLines = readLinesFromFile(actualFile, Qt::KeepEmptyParts);
     QVERIFY(!actualLines.isEmpty());
-    const auto expectedLines = readLinesFromFile(expectedFile, QString::KeepEmptyParts);
+    const auto expectedLines = readLinesFromFile(expectedFile, Qt::KeepEmptyParts);
     QVERIFY(!expectedLines.isEmpty());
     const QString diff = doCompare(actualLines, expectedLines, path);
     if (!diff.isEmpty())