Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

4 files changed, 49 insertions, 32 deletions

diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 083e78375a..1cbe0cae48 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -163,7 +163,8 @@ private Q_SLOTS:
     void streamSerializationQJsonValue();
     void streamSerializationQJsonValueEmpty();
     void streamVariantSerialization();
-
+    void escapeSurrogateCodePoints_data();
+    void escapeSurrogateCodePoints();
 private:
     QString testDataDir;
 };
@@ -2754,9 +2755,6 @@ void tst_QtJson::testJsonValueRefDefault()
 
 void tst_QtJson::arrayInitializerList()
 {
-#ifndef Q_COMPILER_INITIALIZER_LISTS
-    QSKIP("initializer_list is enabled only with c++11 support");
-#else
     QVERIFY(QJsonArray{}.isEmpty());
     QCOMPARE(QJsonArray{"one"}.count(), 1);
     QCOMPARE(QJsonArray{1}.count(), 1);
@@ -2802,14 +2800,10 @@ void tst_QtJson::arrayInitializerList()
             QCOMPARE(QJsonValue(a43["one"]), QJsonValue(1));
         }
     }
-#endif
 }
 
 void tst_QtJson::objectInitializerList()
 {
-#ifndef Q_COMPILER_INITIALIZER_LISTS
-    QSKIP("initializer_list is enabled only with c++11 support");
-#else
     QVERIFY(QJsonObject{}.isEmpty());
 
     {   // one property
@@ -2849,7 +2843,6 @@ void tst_QtJson::objectInitializerList()
         QCOMPARE(QJsonValue(nested[0]), QJsonValue("innerValue"));
         QCOMPARE(QJsonValue(nested[1]), QJsonValue(2.1));
     }
-#endif
 }
 
 void tst_QtJson::unicodeKeys()
@@ -3093,6 +3086,9 @@ void tst_QtJson::streamSerializationQJsonValue_data()
     QTest::newRow("string") << QJsonValue{QStringLiteral("bum")};
     QTest::newRow("array") << QJsonValue{QJsonArray{12,1,5,6,7}};
     QTest::newRow("object") << QJsonValue{QJsonObject{{"foo", 665}, {"bar", 666}}};
+    // test json escape sequence
+    QTest::newRow("array with 0xD800") << QJsonValue(QJsonArray{QString(0xD800)});
+    QTest::newRow("array with 0xDF06,0xD834") << QJsonValue(QJsonArray{QString(0xDF06).append(0xD834)});
 }
 
 void tst_QtJson::streamSerializationQJsonValue()
@@ -3181,5 +3177,26 @@ void tst_QtJson::streamVariantSerialization()
     }
 }
 
+void tst_QtJson::escapeSurrogateCodePoints_data()
+{
+    QTest::addColumn<QString>("str");
+    QTest::addColumn<QByteArray>("escStr");
+    QTest::newRow("0xD800") << QString(0xD800) << QByteArray("\\ud800");
+    QTest::newRow("0xDF06,0xD834") << QString(0xDF06).append(0xD834) << QByteArray("\\udf06\\ud834");
+}
+
+void tst_QtJson::escapeSurrogateCodePoints()
+{
+    QFETCH(QString, str);
+    QFETCH(QByteArray, escStr);
+    QJsonArray array;
+    array.append(str);
+    QByteArray buffer;
+    QDataStream save(&buffer, QIODevice::WriteOnly);
+    save << array;
+    // verify the buffer has escaped values
+    QVERIFY(buffer.contains(escStr));
+}
+
 QTEST_MAIN(tst_QtJson)
 #include "tst_qtjson.moc"
diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp
index 41ea5e56f0..2d4aa452ca 100644
--- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp
+++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
     do {
         line = qin.readLine();
         if (!line.isNull())
-            qerr << line << flush;
+            qerr << line << Qt::flush;
     } while (!line.isNull());
     return 0;
 }
diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
index af97d4a003..c4fb623130 100644
--- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
@@ -245,7 +245,7 @@ private:
 void runOnExit()
 {
     QByteArray buffer;
-    QTextStream(&buffer) << "This will try to use QTextCodec::codecForLocale" << endl;
+    QTextStream(&buffer) << "This will try to use QTextCodec::codecForLocale" << Qt::endl;
 }
 Q_DESTRUCTOR_FUNCTION(runOnExit)
 
@@ -1506,9 +1506,9 @@ void tst_QTextStream::readStdin()
     stdinProcess.setReadChannel(QProcess::StandardError);
 
     QTextStream stream(&stdinProcess);
-    stream << "1" << endl;
-    stream << "2" << endl;
-    stream << "3" << endl;
+    stream << "1" << Qt::endl;
+    stream << "2" << Qt::endl;
+    stream << "3" << Qt::endl;
 
     stdinProcess.closeWriteChannel();
 
@@ -1534,7 +1534,7 @@ void tst_QTextStream::readAllFromStdin()
 
     QTextStream stream(&stdinProcess);
     stream.setCodec("ISO-8859-1");
-    stream << "hello world" << flush;
+    stream << "hello world" << Qt::flush;
 
     stdinProcess.closeWriteChannel();
 
@@ -1824,7 +1824,7 @@ void tst_QTextStream::utf8IncompleteAtBufferBoundary()
         out.setFieldWidth(3);
 
         for (int i = 0; i < 1000; ++i) {
-            out << i << lineContents << endl;
+            out << i << lineContents << Qt::endl;
         }
     }
     data.close();
@@ -2726,7 +2726,7 @@ void tst_QTextStream::generateBOM()
 
         QTextStream stream(&file);
         stream.setCodec(QTextCodec::codecForName("UTF-16LE"));
-        stream << "Hello" << endl;
+        stream << "Hello" << Qt::endl;
 
         file.close();
         QVERIFY(file.open(QFile::ReadOnly));
@@ -2740,7 +2740,7 @@ void tst_QTextStream::generateBOM()
 
         QTextStream stream(&file);
         stream.setCodec(QTextCodec::codecForName("UTF-16LE"));
-        stream << bom << "Hello" << endl;
+        stream << Qt::bom << "Hello" << Qt::endl;
 
         file.close();
         QVERIFY(file.open(QFile::ReadOnly));
diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
index e4d50607b7..92a0d8bbfa 100644
--- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
@@ -115,7 +115,7 @@ static QByteArray makeCanonical(const QString &filename,
                     writeDtd << "<!DOCTYPE ";
                     writeDtd << docType;
                     writeDtd << " [";
-                    writeDtd << endl;
+                    writeDtd << Qt::endl;
                     for (const QXmlStreamNotationDeclaration &notation : sorted_by_name(notationDeclarations)) {
                         writeDtd << "<!NOTATION ";
                         writeDtd << notation.name().toString();
@@ -134,11 +134,11 @@ static QByteArray makeCanonical(const QString &filename,
                             }
                         }
                         writeDtd << '>';
-                        writeDtd << endl;
+                        writeDtd << Qt::endl;
                     }
 
                     writeDtd << "]>";
-                    writeDtd << endl;
+                    writeDtd << Qt::endl;
                     writer.writeDTD(dtd);
                 }
             } else if (reader.isStartElement()) {
@@ -740,7 +740,7 @@ QByteArray tst_QXmlStream::readFile(const QString &filename)
         const auto attributes = reader.attributes();
         if (attributes.size()) {
             for (const QXmlStreamAttribute &attribute : attributes) {
-                writer << endl << "    Attribute(";
+                writer << Qt::endl << "    Attribute(";
                 if (!attribute.name().isEmpty())
                     writer << " name=\"" << attribute.name().toString() << '"';
                 if (!attribute.namespaceUri().isEmpty())
@@ -751,37 +751,37 @@ QByteArray tst_QXmlStream::readFile(const QString &filename)
                     writer << " prefix=\"" << attribute.prefix().toString() << '"';
                 if (!attribute.value().isEmpty())
                     writer << " value=\"" << attribute.value().toString() << '"';
-                writer << " )" << endl;
+                writer << " )" << Qt::endl;
             }
         }
         const auto namespaceDeclarations = reader.namespaceDeclarations();
         if (namespaceDeclarations.size()) {
             for (const QXmlStreamNamespaceDeclaration &namespaceDeclaration : namespaceDeclarations) {
-                writer << endl << "    NamespaceDeclaration(";
+                writer << Qt::endl << "    NamespaceDeclaration(";
                 if (!namespaceDeclaration.prefix().isEmpty())
                     writer << " prefix=\"" << namespaceDeclaration.prefix().toString() << '"';
                 if (!namespaceDeclaration.namespaceUri().isEmpty())
                     writer << " namespaceUri=\"" << namespaceDeclaration.namespaceUri().toString() << '"';
-                writer << " )" << endl;
+                writer << " )" << Qt::endl;
             }
         }
         const auto notationDeclarations = reader.notationDeclarations();
         if (notationDeclarations.size()) {
             for (const QXmlStreamNotationDeclaration &notationDeclaration : notationDeclarations) {
-                writer << endl << "    NotationDeclaration(";
+                writer << Qt::endl << "    NotationDeclaration(";
                 if (!notationDeclaration.name().isEmpty())
                     writer << " name=\"" << notationDeclaration.name().toString() << '"';
                 if (!notationDeclaration.systemId().isEmpty())
                     writer << " systemId=\"" << notationDeclaration.systemId().toString() << '"';
                 if (!notationDeclaration.publicId().isEmpty())
                     writer << " publicId=\"" << notationDeclaration.publicId().toString() << '"';
-                writer << " )" << endl;
+                writer << " )" << Qt::endl;
             }
         }
         const auto entityDeclarations = reader.entityDeclarations();
         if (entityDeclarations.size()) {
             for (const QXmlStreamEntityDeclaration &entityDeclaration : entityDeclarations) {
-                writer << endl << "    EntityDeclaration(";
+                writer << Qt::endl << "    EntityDeclaration(";
                 if (!entityDeclaration.name().isEmpty())
                     writer << " name=\"" << entityDeclaration.name().toString() << '"';
                 if (!entityDeclaration.notationName().isEmpty())
@@ -792,13 +792,13 @@ QByteArray tst_QXmlStream::readFile(const QString &filename)
                     writer << " publicId=\"" << entityDeclaration.publicId().toString() << '"';
                 if (!entityDeclaration.value().isEmpty())
                     writer << " value=\"" << entityDeclaration.value().toString() << '"';
-                writer << " )" << endl;
+                writer << " )" << Qt::endl;
             }
         }
-        writer << " )" << endl;
+        writer << " )" << Qt::endl;
     }
     if (reader.hasError())
-        writer << "ERROR: " << reader.errorString() << endl;
+        writer << "ERROR: " << reader.errorString() << Qt::endl;
     return outarray;
 }
 
@@ -1169,7 +1169,7 @@ int main(int argc, char *argv[])
         bool error = false;
         QByteArray canonical = makeCanonical(argv[2], "doc", error);
         QTextStream myStdOut(stdout);
-        myStdOut << canonical << endl;
+        myStdOut << canonical << Qt::endl;
         exit(0);
     }