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

Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index f797890e5d..271b6d7afc 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -762,7 +762,7 @@ void Widget::splitFunction()
 
     //! [60]
     str = "This time, a normal English sentence.";
-    list = str.split(QRegExp("\\W+"), QString::SkipEmptyParts);
+    list = str.split(QRegExp("\\W+"), Qt::SkipEmptyParts);
     // list: [ "This", "time", "a", "normal", "English", "sentence" ]
     //! [60]
 
@@ -783,7 +783,7 @@ void Widget::splitFunction()
 
     //! [91]
     str = "This time, a normal English sentence.";
-    list = str.split(QRegularExpression("\\W+"), QString::SkipEmptyParts);
+    list = str.split(QRegularExpression("\\W+"), Qt::SkipEmptyParts);
     // list: [ "This", "time", "a", "normal", "English", "sentence" ]
     //! [91]
 
@@ -797,24 +797,24 @@ void Widget::splitFunction()
 void Widget::splitCaseSensitiveFunction()
 {
     //! [62]
-    QString str = "a,,b,c";
+    QString str = QStringLiteral("a,,b,c");
 
-    QStringList list1 = str.split(',');
+    QStringList list1 = str.split(QLatin1Char(','));
     // list1: [ "a", "", "b", "c" ]
 
-    QStringList list2 = str.split(',', QString::SkipEmptyParts);
+    QStringList list2 = str.split(QLatin1Char(','), Qt::SkipEmptyParts);
     // list2: [ "a", "b", "c" ]
     //! [62]
 
     //! [62-empty]
     QString str = "abc";
-    auto parts = str.split("");
+    auto parts = str.split(QString());
     // parts: {"", "a", "b", "c", ""}
     //! [62-empty]
 
     //! [62-slashes]
     QString str = "/a/b/c/";
-    auto parts = str.split('/');
+    auto parts = str.split(QLatin1Char('/'));
     // parts: {"", "a", "b", "c", ""}
     //! [62-slashes]
 }