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: I72aa0ccae06030043ba40f0f908826e5ca4a31ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 7 insertions, 7 deletions

diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index f998c4309..3f68244ba 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -866,7 +866,7 @@ QSet<QString> QGstUtils::supportedMimeTypes(bool (*isValidFactory)(GstElementFac
                             if (value) {
                                 gchar *str = gst_value_serialize(value);
                                 QString versions = QLatin1String(str);
-                                const QStringList elements = versions.split(QRegularExpression(QLatin1String("\\D+")), QString::SkipEmptyParts);
+                                const QStringList elements = versions.split(QRegularExpression(QLatin1String("\\D+")), Qt::SkipEmptyParts);
                                 for (const QString &e : elements)
                                     supportedMimeTypes.insert(nameLowcase + e);
                                 g_free(str);
diff --git a/src/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index 88bd591c2..3e9e6cc21 100644
--- a/src/multimedia/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
@@ -104,7 +104,7 @@ QList<QObject*> QMediaPluginLoader::instances(QString const &key)
 
     static const bool showDebug = qEnvironmentVariableIntValue("QT_DEBUG_PLUGINS");
     static const QStringList preferredPlugins =
-        qEnvironmentVariable("QT_MULTIMEDIA_PREFERRED_PLUGINS").split(QLatin1Char(','), QString::SkipEmptyParts);
+        qEnvironmentVariable("QT_MULTIMEDIA_PREFERRED_PLUGINS").split(QLatin1Char(','), Qt::SkipEmptyParts);
     for (int i = preferredPlugins.size() - 1; i >= 0; --i) {
         auto name = preferredPlugins[i];
         bool found = false;
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
index ef86af896..66eafc765 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -176,12 +176,12 @@ void QAndroidMetaDataReaderControl::extractMetadata(QAndroidMetaDataReaderContro
         if (!string.isNull()) {
             metadata.insert(isVideo ? QMediaMetaData::LeadPerformer
                                     : QMediaMetaData::ContributingArtist,
-                            string.split('/', QString::SkipEmptyParts));
+                            string.split('/', Qt::SkipEmptyParts));
         }
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Author);
         if (!string.isNull())
-            metadata.insert(QMediaMetaData::Author, string.split('/', QString::SkipEmptyParts));
+            metadata.insert(QMediaMetaData::Author, string.split('/', Qt::SkipEmptyParts));
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Bitrate);
         if (!string.isNull()) {
@@ -196,7 +196,7 @@ void QAndroidMetaDataReaderControl::extractMetadata(QAndroidMetaDataReaderContro
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Composer);
         if (!string.isNull())
-            metadata.insert(QMediaMetaData::Composer, string.split('/', QString::SkipEmptyParts));
+            metadata.insert(QMediaMetaData::Composer, string.split('/', Qt::SkipEmptyParts));
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Date);
         if (!string.isNull())
@@ -231,7 +231,7 @@ void QAndroidMetaDataReaderControl::extractMetadata(QAndroidMetaDataReaderContro
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Writer);
         if (!string.isNull())
-            metadata.insert(QMediaMetaData::Writer, string.split('/', QString::SkipEmptyParts));
+            metadata.insert(QMediaMetaData::Writer, string.split('/', Qt::SkipEmptyParts));
 
         string = retriever.extractMetadata(AndroidMediaMetadataRetriever::Year);
         if (!string.isNull())
diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
index f899481f0..de8422b86 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
@@ -271,7 +271,7 @@ void AndroidMediaPlayer::setAudioRole(QAudio::Role role)
 
 void AndroidMediaPlayer::setCustomAudioRole(const QString &role)
 {
-    QStringList roles = role.split(",", QString::SkipEmptyParts);
+    QStringList roles = role.split(",", Qt::SkipEmptyParts);
 
     int type = 0; // CONTENT_TYPE_UNKNOWN
     int usage = 0; // USAGE_UNKNOWN