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

Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb

9 files changed, 75 insertions, 34 deletions

diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index f7d8bda190..35bd518b3a 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -670,6 +670,22 @@ void tst_qmessagehandler::cleanupFuncinfo_data()
     QTest::newRow("gcc_39")
         << "int TestClass1::operator>(int)"
         << "TestClass1::operator>";
+
+    QTest::newRow("objc_1")
+        << "-[SomeClass someMethod:withArguments:]"
+        << "-[SomeClass someMethod:withArguments:]";
+
+    QTest::newRow("objc_2")
+        << "+[SomeClass withClassMethod:withArguments:]"
+        << "+[SomeClass withClassMethod:withArguments:]";
+
+    QTest::newRow("objc_3")
+        << "-[SomeClass someMethodWithoutArguments]"
+        << "-[SomeClass someMethodWithoutArguments]";
+
+    QTest::newRow("objc_4")
+        << "__31-[SomeClass someMethodSchedulingBlock]_block_invoke"
+        << "__31-[SomeClass someMethodSchedulingBlock]_block_invoke";
 }
 #endif
 
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 77a60997a6..3e68e4859f 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -118,6 +118,7 @@ private slots:
     void testUpdateRequestEvent();
     void testThreadSafety();
     void testEmptyData();
+    void testEmptyKey();
     void testResourceFiles();
     void testRegistryShortRootNames();
     void trailingWhitespace();
@@ -2025,6 +2026,16 @@ void tst_QSettings::testEmptyData()
     QFile::remove(filename);
 }
 
+void tst_QSettings::testEmptyKey()
+{
+    QSettings settings;
+    QTest::ignoreMessage(QtWarningMsg, "QSettings::value: Empty key passed");
+    const QVariant value = settings.value(QString());
+    QCOMPARE(value, QVariant());
+    QTest::ignoreMessage(QtWarningMsg, "QSettings::setValue: Empty key passed");
+    settings.setValue(QString(), value);
+}
+
 void tst_QSettings::testResourceFiles()
 {
     QSettings settings(":/resourcefile.ini", QSettings::IniFormat);
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 05c4066cbd..a35896283a 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -1604,7 +1604,7 @@ void tst_QMetaType::automaticTemplateRegistration()
 
 #endif // Q_COMPILER_VARIADIC_MACROS
 
-#define TEST_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE, FLAG_TEST, FROMVARIANTFUNCTION) \
+#define TEST_OWNING_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE, FLAG_TEST, FROMVARIANTFUNCTION) \
     { \
         SMARTPOINTER < ELEMENT_TYPE > sp(new ELEMENT_TYPE); \
         sp.data()->setObjectName("Test name"); \
@@ -1615,22 +1615,34 @@ void tst_QMetaType::automaticTemplateRegistration()
         QCOMPARE(extractedPtr.data()->objectName(), sp.data()->objectName()); \
     }
 
-    TEST_SMARTPOINTER(QSharedPointer, QObject, SharedPointerToQObject, qSharedPointerFromVariant)
-    TEST_SMARTPOINTER(QSharedPointer, QFile, SharedPointerToQObject, qSharedPointerFromVariant)
-    TEST_SMARTPOINTER(QSharedPointer, QTemporaryFile, SharedPointerToQObject, qSharedPointerFromVariant)
-    TEST_SMARTPOINTER(QSharedPointer, MyObject, SharedPointerToQObject, qSharedPointerFromVariant)
+    TEST_OWNING_SMARTPOINTER(QSharedPointer, QObject, SharedPointerToQObject, qSharedPointerFromVariant)
+    TEST_OWNING_SMARTPOINTER(QSharedPointer, QFile, SharedPointerToQObject, qSharedPointerFromVariant)
+    TEST_OWNING_SMARTPOINTER(QSharedPointer, QTemporaryFile, SharedPointerToQObject, qSharedPointerFromVariant)
+    TEST_OWNING_SMARTPOINTER(QSharedPointer, MyObject, SharedPointerToQObject, qSharedPointerFromVariant)
+#undef TEST_OWNING_SMARTPOINTER
 
-    TEST_SMARTPOINTER(QWeakPointer, QObject, WeakPointerToQObject, qWeakPointerFromVariant)
-    TEST_SMARTPOINTER(QWeakPointer, QFile, WeakPointerToQObject, qWeakPointerFromVariant)
-    TEST_SMARTPOINTER(QWeakPointer, QTemporaryFile, WeakPointerToQObject, qWeakPointerFromVariant)
-    TEST_SMARTPOINTER(QWeakPointer, MyObject, WeakPointerToQObject, qWeakPointerFromVariant)
+#define TEST_NONOWNING_SMARTPOINTER(SMARTPOINTER, ELEMENT_TYPE, FLAG_TEST, FROMVARIANTFUNCTION) \
+    { \
+        ELEMENT_TYPE elem; \
+        SMARTPOINTER < ELEMENT_TYPE > sp(&elem); \
+        sp.data()->setObjectName("Test name"); \
+        QVariant v = QVariant::fromValue(sp); \
+        QCOMPARE(v.typeName(), #SMARTPOINTER "<" #ELEMENT_TYPE ">"); \
+        QVERIFY(QMetaType::typeFlags(::qMetaTypeId<SMARTPOINTER < ELEMENT_TYPE > >()) & QMetaType::FLAG_TEST); \
+        SMARTPOINTER < QObject > extractedPtr = FROMVARIANTFUNCTION<QObject>(v); \
+        QCOMPARE(extractedPtr.data()->objectName(), sp.data()->objectName()); \
+    }
 
-    TEST_SMARTPOINTER(QPointer, QObject, TrackingPointerToQObject, qPointerFromVariant)
-    TEST_SMARTPOINTER(QPointer, QFile, TrackingPointerToQObject, qPointerFromVariant)
-    TEST_SMARTPOINTER(QPointer, QTemporaryFile, TrackingPointerToQObject, qPointerFromVariant)
-    TEST_SMARTPOINTER(QPointer, MyObject, TrackingPointerToQObject, qPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QWeakPointer, QObject, WeakPointerToQObject, qWeakPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QWeakPointer, QFile, WeakPointerToQObject, qWeakPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QWeakPointer, QTemporaryFile, WeakPointerToQObject, qWeakPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QWeakPointer, MyObject, WeakPointerToQObject, qWeakPointerFromVariant)
 
-#undef TEST_SMARTPOINTER
+    TEST_NONOWNING_SMARTPOINTER(QPointer, QObject, TrackingPointerToQObject, qPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QPointer, QFile, TrackingPointerToQObject, qPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QPointer, QTemporaryFile, TrackingPointerToQObject, qPointerFromVariant)
+    TEST_NONOWNING_SMARTPOINTER(QPointer, MyObject, TrackingPointerToQObject, qPointerFromVariant)
+#undef TEST_NONOWNING_SMARTPOINTER
 }
 
 template <typename T>
diff --git a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
index 1f1777f3b4..f4c267e321 100644
--- a/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
+++ b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
@@ -327,5 +327,5 @@ void tst_QMimeData::setUrls() const
     QCOMPARE(mimeData.hasText(), false);
 }
 
-QTEST_MAIN(tst_QMimeData)
+QTEST_APPLESS_MAIN(tst_QMimeData)
 #include "tst_qmimedata.moc"
diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
index 09d5db1475..689b008551 100644
--- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
+++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
@@ -345,7 +345,8 @@ void tst_QPointer::threadSafety()
 
 void tst_QPointer::qvariantCast()
 {
-    QPointer<QFile> tracking = new QFile;
+    QFile file;
+    QPointer<QFile> tracking = &file;
     tracking->setObjectName("A test name");
     QVariant v = QVariant::fromValue(tracking);
 
diff --git a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
index 182fa8b461..820039b6a9 100644
--- a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
+++ b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
@@ -76,35 +76,35 @@ void tst_QState::assignProperty()
 {
     QStateMachine machine;
 
-    QObject *object = new QObject();
-    object->setProperty("fooBar", 10);
+    QObject object;
+    object.setProperty("fooBar", 10);
 
     QState *s1 = new QState(&machine);
-    s1->assignProperty(object, "fooBar", 20);
+    s1->assignProperty(&object, "fooBar", 20);
 
     machine.setInitialState(s1);
     machine.start();
     QCoreApplication::processEvents();
 
-    QCOMPARE(object->property("fooBar").toInt(), 20);
+    QCOMPARE(object.property("fooBar").toInt(), 20);
 }
 
 void tst_QState::assignPropertyTwice()
 {
     QStateMachine machine;
 
-    QObject *object = new QObject();
-    object->setProperty("fooBar", 10);
+    QObject object;
+    object.setProperty("fooBar", 10);
 
     QState *s1 = new QState(&machine);
-    s1->assignProperty(object, "fooBar", 20);
-    s1->assignProperty(object, "fooBar", 30);
+    s1->assignProperty(&object, "fooBar", 20);
+    s1->assignProperty(&object, "fooBar", 30);
 
     machine.setInitialState(s1);
     machine.start();
     QCoreApplication::processEvents();
 
-    QCOMPARE(object->property("fooBar").toInt(), 30);
+    QCOMPARE(object.property("fooBar").toInt(), 30);
 }
 
 class EventTestTransition: public QAbstractTransition
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index f6bdb6c53b..9c2c8bf12a 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -906,11 +906,12 @@ void tst_QThreadPool::waitForDone()
 
 void tst_QThreadPool::waitForDoneTimeout()
 {
+    QMutex mutex;
     class BlockedTask : public QRunnable
     {
     public:
-      QMutex mutex;
-      BlockedTask() { setAutoDelete(false); }
+      QMutex &mutex;
+      explicit BlockedTask(QMutex &m) : mutex(m) {}
 
       void run()
         {
@@ -922,11 +923,10 @@ void tst_QThreadPool::waitForDoneTimeout()
 
     QThreadPool threadPool;
 
-    BlockedTask *task = new BlockedTask;
-    task->mutex.lock();
-    threadPool.start(task);
+    mutex.lock();
+    threadPool.start(new BlockedTask(mutex));
     QVERIFY(!threadPool.waitForDone(100));
-    task->mutex.unlock();
+    mutex.unlock();
     QVERIFY(threadPool.waitForDone(400));
 }
 
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index 1fa434395e..d5a628889c 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -2112,7 +2112,8 @@ void tst_QSharedPointer::qvariantCast()
     // Intentionally does not compile.
 //     QWeakPointer<int> sop = qWeakPointerFromVariant<int>(v);
 
-    QWeakPointer<QFile> tracking = new QFile;
+    QFile file;
+    QWeakPointer<QFile> tracking = &file;
     tracking.data()->setObjectName("A test name");
     v = QVariant::fromValue(tracking);
 
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index a38707ef08..3ba901061c 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -1870,9 +1870,9 @@ void tst_QStringRef::right()
     QStringRef ref = originalString.rightRef(originalString.size() - 1);
     QCOMPARE(ref.toString(), QLatin1String("OrginalString"));
 
-    QCOMPARE(ref.right(ref.size() - 6).toString(), QLatin1String("String"));
+    QCOMPARE(ref.right(6).toString(), QLatin1String("String"));
     QCOMPARE(ref.right(ref.size()).toString(), QLatin1String("OrginalString"));
-    QCOMPARE(ref.right(0).toString(), QLatin1String("OrginalString"));
+    QCOMPARE(ref.right(0).toString(), QLatin1String(""));
 
     QStringRef nullRef;
     QVERIFY(nullRef.isNull());