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

This also reverts commit 018e670a26ff5a61b949100ae080f5e654e7bee8.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4

4 files changed, 22 insertions, 1 deletions

diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 540284f0b1..b1b94a3c5f 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -1844,6 +1844,8 @@ void tst_QObject::moveToThread()
         thread.wait();
     }
 
+    // WinRT does not allow connection to localhost
+#ifndef Q_OS_WINRT
     {
         // make sure socket notifiers are moved with the object
         MoveToThreadThread thread;
@@ -1879,6 +1881,7 @@ void tst_QObject::moveToThread()
         QMetaObject::invokeMethod(socket, "deleteLater", Qt::QueuedConnection);
         thread.wait();
     }
+#endif
 }
 
 
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
index d70ed4f47f..1598382959 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -126,6 +126,10 @@ signals:
 
 void tst_QSocketNotifier::unexpectedDisconnection()
 {
+#ifdef Q_OS_WINRT
+    // WinRT does not allow a connection to the localhost
+    QSKIP("Local connection not allowed", SkipAll);
+#else
     /*
       Given two sockets and two QSocketNotifiers registered on each
       their socket. If both sockets receive data, and the first slot
@@ -191,6 +195,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     writeEnd1->close();
     writeEnd2->close();
     server.close();
+#endif // !Q_OS_WINRT
 }
 
 class MixingWithTimersHelper : public QObject
@@ -229,6 +234,9 @@ void MixingWithTimersHelper::socketFired()
 
 void tst_QSocketNotifier::mixingWithTimers()
 {
+#ifdef Q_OS_WINRT
+    QSKIP("WinRT does not allow connection to localhost", SkipAll);
+#else
     QTimer timer;
     timer.setInterval(0);
     timer.start();
@@ -253,6 +261,7 @@ void tst_QSocketNotifier::mixingWithTimers()
 
     QCOMPARE(helper.timerActivated, true);
     QTRY_COMPARE(helper.socketActivated, true);
+#endif // !Q_OS_WINRT
 }
 
 #ifdef Q_OS_UNIX
diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
index b7a5a85e09..63189e5562 100644
--- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
@@ -5,5 +5,5 @@ SOURCES = tst_qtranslator.cpp
 RESOURCES += qtranslator.qrc
 
 android:!android-no-sdk: RESOURCES += android_testdata.qrc
-else: TESTDATA += hellotr_la.qm msgfmt_from_po.qm
+else: TESTDATA += dependencies_la.qm hellotr_la.qm msgfmt_from_po.qm
 
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index c366b38d57..59ea484355 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -53,6 +53,7 @@ private slots:
 
 private:
     int languageChangeEventCounter;
+    QSharedPointer<QTemporaryDir> dataDir;
 };
 
 tst_QTranslator::tst_QTranslator()
@@ -85,8 +86,16 @@ void tst_QTranslator::initTestCase()
 
     // chdir into the directory containing our testdata,
     // to make the code simpler (load testdata via relative paths)
+#ifdef Q_OS_WINRT
+    // ### TODO: Use this for all platforms in 5.7
+    dataDir = QEXTRACTTESTDATA(QStringLiteral("/"));
+    QVERIFY2(!dataDir.isNull(), qPrintable("Could not extract test data"));
+    QVERIFY2(QDir::setCurrent(dataDir->path()), qPrintable("Could not chdir to " + dataDir->path()));
+#else // !Q_OS_WINRT
     QString testdata_dir = QFileInfo(QFINDTESTDATA("hellotr_la.qm")).absolutePath();
     QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir));
+#endif // !Q_OS_WINRT
+
 }
 
 bool tst_QTranslator::eventFilter(QObject *, QEvent *event)