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

 Conflicts:
	qmake/generators/makefile.cpp
	qmake/generators/unix/unixmake2.cpp
	src/corelib/thread/qthread_unix.cpp
	tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp

Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408

2 files changed, 24 insertions, 5 deletions

diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index a98d37d733..a8111af6c1 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -834,6 +834,13 @@ void tst_QRegExp::testEscapingWildcard_data(){
     QTest::newRow("a true '\\' in input") << "\\Qt;" <<  "\\Qt;" << true;
     QTest::newRow("two true '\\' in input") << "\\\\Qt;" <<  "\\\\Qt;" << true;
     QTest::newRow("a '\\' at the end") << "\\\\Qt;\\" <<  "\\\\Qt;\\" << true;
+
+    QTest::newRow("[]\\] matches ]") << "[]\\]" << "]" << true;
+    QTest::newRow("[]\\] matches \\") << "[]\\]" << "\\" << true;
+    QTest::newRow("[]\\] does not match [") << "[]\\]" << "[" << false;
+    QTest::newRow("[]\\]a matches ]a") << "[]\\]a" << "]a" << true;
+    QTest::newRow("[]\\]a matches \\a") << "[]\\]a" << "\\a" << true;
+    QTest::newRow("[]\\]a does not match [a") << "[]\\]a" << "[a" << false;
 }
 
 void tst_QRegExp::testEscapingWildcard(){
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 42792b5310..d0bc237a5d 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -40,6 +40,7 @@
 #include "nontracked.h"
 #include "wrapper.h"
 
+#include <memory>
 #include <stdlib.h>
 #include <time.h>
 
@@ -231,6 +232,12 @@ struct NoDefaultConstructorRRef1
     NoDefaultConstructorRRef1(int &&i) : i(i) {}
 };
 
+struct NoDefaultConstructorRRef2
+{
+    std::unique_ptr<int> i;
+    NoDefaultConstructorRRef2(std::unique_ptr<int> &&i) : i(std::move(i)) {}
+};
+
 void tst_QSharedPointer::basics_data()
 {
     QTest::addColumn<bool>("isNull");
@@ -1865,15 +1872,20 @@ void tst_QSharedPointer::creatingVariadic()
         QCOMPARE(&ptr->i, &i);
     }
     {
-        NoDefaultConstructorRRef1(1); // control check
-        QSharedPointer<NoDefaultConstructorRRef1> ptr = QSharedPointer<NoDefaultConstructorRRef1>::create(1);
-        QCOMPARE(ptr->i, 1);
-
         NoDefaultConstructorRRef1(std::move(i)); // control check
-        ptr = QSharedPointer<NoDefaultConstructorRRef1>::create(std::move(i));
+        QSharedPointer<NoDefaultConstructorRRef1> ptr = QSharedPointer<NoDefaultConstructorRRef1>::create(std::move(i));
         QCOMPARE(ptr->i, i);
     }
     {
+        NoDefaultConstructorRRef2(std::unique_ptr<int>(new int(1))); // control check
+        QSharedPointer<NoDefaultConstructorRRef2> ptr = QSharedPointer<NoDefaultConstructorRRef2>::create(std::unique_ptr<int>(new int(1)));
+        QCOMPARE(*ptr->i, 1);
+
+        std::unique_ptr<int> p(new int(i));
+        ptr = QSharedPointer<NoDefaultConstructorRRef2>::create(std::move(p));
+        QCOMPARE(*ptr->i, i);
+    }
+    {
         QString text("Hello, World");
         NoDefaultConstructorRef2(text, 1); // control check
         QSharedPointer<NoDefaultConstructorRef2> ptr = QSharedPointer<NoDefaultConstructorRef2>::create(text, 1);