Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97

4 files changed, 5 insertions, 5 deletions

diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp
index 25c1e44b8c..12b9c6d55e 100644
--- a/tests/manual/dialogs/filedialogpanel.cpp
+++ b/tests/manual/dialogs/filedialogpanel.cpp
@@ -307,7 +307,7 @@ QFileDialog::Options FileDialogPanel::options() const
 
 QStringList FileDialogPanel::allowedSchemes() const
 {
-    return m_allowedSchemes->text().simplified().split(' ', QString::SkipEmptyParts);
+    return m_allowedSchemes->text().simplified().split(' ', Qt::SkipEmptyParts);
 }
 
 void FileDialogPanel::getOpenFileNames()
@@ -468,7 +468,7 @@ void FileDialogPanel::applySettings(QFileDialog *d) const
     if (!file.isEmpty())
        d->selectFile(file);
     const QString filter = m_selectedNameFilter->text().trimmed();
-    const QStringList filters = m_nameFilters->toPlainText().trimmed().split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    const QStringList filters = m_nameFilters->toPlainText().trimmed().split(QLatin1Char('\n'), Qt::SkipEmptyParts);
     if (!m_useMimeTypeFilters->isChecked()) {
         d->setNameFilters(filters);
         if (!filter.isEmpty())
diff --git a/tests/manual/highdpi/dragwidget.cpp b/tests/manual/highdpi/dragwidget.cpp
index 8ad3d3ca47..674b2e6a0d 100644
--- a/tests/manual/highdpi/dragwidget.cpp
+++ b/tests/manual/highdpi/dragwidget.cpp
@@ -110,7 +110,7 @@ void DragWidget::dropEvent(QDropEvent *event)
     if (event->mimeData()->hasText()) {
         const QMimeData *mime = event->mimeData();
         QStringList pieces = mime->text().split(QRegularExpression("\\s+"),
-                             QString::SkipEmptyParts);
+                             Qt::SkipEmptyParts);
         QPoint position = event->pos();
         QPoint hotSpot;
 
diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index b08715f83c..662fc35ad6 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
             if (file.open(QIODevice::ReadOnly)) {
                 QTextStream textFile(&file);
                 QString script = textFile.readAll();
-                content = script.split("\n", QString::SkipEmptyParts);
+                content = script.split("\n", Qt::SkipEmptyParts);
             } else {
                 printf("failed to read file: '%s'\n", qPrintable(fileinfo.absoluteFilePath()));
                 continue;
diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp
index c1e49b3b7e..6baf611b98 100644
--- a/tests/manual/textrendering/glyphshaping/main.cpp
+++ b/tests/manual/textrendering/glyphshaping/main.cpp
@@ -54,7 +54,7 @@ struct testDataSet
 QString charHexCsv2String(const QString &csv)
 {
     QString result;
-    foreach (const QString &charString, csv.split(QLatin1Char(','), QString::SkipEmptyParts)) {
+    foreach (const QString &charString, csv.split(QLatin1Char(','), Qt::SkipEmptyParts)) {
         bool isOk;
         const uint charUInt = charString.toUInt(&isOk, 16);
         Q_ASSERT(isOk);