Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
index da38ed254b..8a5c8ec1df 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -770,22 +770,22 @@ void tst_QXmlSimpleReader::dtdRecursionLimit()
     QVERIFY(file.open(QIODevice::ReadOnly));
     QXmlSimpleReader xmlReader;
     {
-        QXmlInputSource *source = new QXmlInputSource(&file);
+        QXmlInputSource source(&file);
         TestHandler handler;
         xmlReader.setDeclHandler(&handler);
         xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(source));
+        QVERIFY(!xmlReader.parse(&source));
     }
 
     file.close();
     file.setFileName(QFINDTESTDATA("xmldocs/1-levels-nested-dtd.xml"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     {
-        QXmlInputSource *source = new QXmlInputSource(&file);
+        QXmlInputSource source(&file);
         TestHandler handler;
         xmlReader.setDeclHandler(&handler);
         xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(source));
+        QVERIFY(!xmlReader.parse(&source));
         // The error wasn't because of the recursion limit being reached,
         // it was because the document is not valid.
         QVERIFY(handler.recursionCount < 2);
@@ -795,11 +795,11 @@ void tst_QXmlSimpleReader::dtdRecursionLimit()
     file.setFileName(QFINDTESTDATA("xmldocs/internal-entity-polynomial-attribute.xml"));
     QVERIFY(file.open(QIODevice::ReadOnly));
     {
-        QXmlInputSource *source = new QXmlInputSource(&file);
+        QXmlInputSource source(&file);
         TestHandler handler;
         xmlReader.setDeclHandler(&handler);
         xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(source));
+        QVERIFY(!xmlReader.parse(&source));
         QCOMPARE(handler.recursionCount, 2);
     }
 }