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

Also bump minimum required Qt version for Android: Ministro updates.

Conflicts:
	src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
	src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: I966f249bebf92da37bfdeb995ad21b027eb03301

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 5d5e00ac42..b591112bd1 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -760,22 +760,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("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);
@@ -785,11 +785,11 @@ void tst_QXmlSimpleReader::dtdRecursionLimit()
     file.setFileName("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);
     }
 }