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

Conflicts:
	src/plugins/platforms/cocoa/qcocoamenubar.mm

Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb

26 files changed, 613 insertions, 146 deletions

diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index cca4655f58..42dca7fc66 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -1193,6 +1193,13 @@ void tst_QFile::permissions()
     if (qt_ntfs_permission_lookup)
         QEXPECT_FAIL("readonly", "QTBUG-25630", Abort);
 #endif
+#ifdef Q_OS_UNIX
+    if (strcmp(QTest::currentDataTag(), "readonly") == 0) {
+        // in case accidentally run as root
+        if (::getuid() == 0)
+            QSKIP("Running this test as root doesn't make sense");
+    }
+#endif
     QCOMPARE((memberResult == QFile::Permissions(perms)), expected);
     QCOMPARE((staticResult == QFile::Permissions(perms)), expected);
 }
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index 898aefffd3..2a79a6963e 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -1937,6 +1937,21 @@ void tst_QUrl::strictParser_data()
     QTest::newRow("invalid-ipvfuture-3") << "http://[v789]" << "Invalid IPvFuture address";
     QTest::newRow("unbalanced-brackets") << "http://[ff02::1" << "Expected ']' to match '[' in hostname";
 
+    // invalid IDN hostnames happen in TolerantMode too
+    QTest::newRow("idn-prohibited-char-space") << "http:// " << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-nbsp") << "http://\xc2\xa0" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-control-1f") << "http://\x1f" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-control-7f") << "http://\x7f" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-control-80") << "http://\xc2\x80" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-private-bmp") << "http://\xee\x80\x80" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-private-plane15") << "http://\xf3\xb0\x80\x80" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-private-plane16") << "http://\xf4\x80\x80\x80" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-ffff") << "http://\xef\xbf\xbf" << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-surrogate-1") << "http://" + QString(QChar(0xD800)) << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-surrogate-2") << "http://" + QString(QChar(0xDC00)) << "Invalid hostname (contains invalid characters)";
+    QTest::newRow("idn-prohibited-char-surrogate-3") << "http://" + QString(QChar(0xD800)) + "a" << "Invalid hostname (contains invalid characters)";
+    // FIXME: add some tests for prohibited BiDi (RFC 3454 section 6)
+
     // port errors happen in TolerantMode too
     QTest::newRow("empty-port-1") << "http://example.com:" << "Port field was empty";
     QTest::newRow("empty-port-2") << "http://example.com:/" << "Port field was empty";
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index fa3dec620a..2014045171 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -351,7 +351,7 @@ void tst_QUrlInternal::nameprep_testsuite_data()
         << QString() << 0 << 0;
 
     QTest::newRow("Non-ASCII multibyte space character U+1680")
-        << QString::fromUtf8("\xE1\x9A\x80")
+        << QString::fromUtf8("x\xE1\x9A\x80x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
@@ -375,13 +375,18 @@ void tst_QUrlInternal::nameprep_testsuite_data()
         << QString::fromUtf8("\x10\x7F")
         << QString() << 0 << 0;
 
+    QTest::newRow("Non-ASCII 8bit control character U+0080")
+        << QString::fromUtf8("x\xC2\x80x")
+        << QString()
+        << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
+
     QTest::newRow("Non-ASCII 8bit control character U+0085")
-        << QString::fromUtf8("\xC2\x85")
+        << QString::fromUtf8("x\xC2\x85x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Non-ASCII multibyte control character U+180E")
-        << QString::fromUtf8("\xE1\xA0\x8E")
+        << QString::fromUtf8("x\xE1\xA0\x8Ex")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
@@ -391,47 +396,47 @@ void tst_QUrlInternal::nameprep_testsuite_data()
         << QString() << 0 << 0;
 
     QTest::newRow("Non-ASCII control character U+1D175")
-        << QString::fromUtf8("\xF0\x9D\x85\xB5")
+        << QString::fromUtf8("x\xF0\x9D\x85\xB5x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Plane 0 private use character U+F123")
-        << QString::fromUtf8("\xEF\x84\xA3")
+        << QString::fromUtf8("x\xEF\x84\xA3x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Plane 15 private use character U+F1234")
-        << QString::fromUtf8("\xF3\xB1\x88\xB4")
+        << QString::fromUtf8("x\xF3\xB1\x88\xB4x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Plane 16 private use character U+10F234")
-        << QString::fromUtf8("\xF4\x8F\x88\xB4")
+        << QString::fromUtf8("x\xF4\x8F\x88\xB4x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Non-character code point U+8FFFE")
-        << QString::fromUtf8("\xF2\x8F\xBF\xBE")
+        << QString::fromUtf8("x\xF2\x8F\xBF\xBEx")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Non-character code point U+10FFFF")
-        << QString::fromUtf8("\xF4\x8F\xBF\xBF")
+        << QString::fromUtf8("x\xF4\x8F\xBF\xBFx")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Surrogate code U+DF42")
-        << QString::fromUtf8("\xED\xBD\x82")
+        << QString::fromUtf8("x\xED\xBD\x82x")
         << QString()
         << QString("Nameprep") << 0 <<  STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Non-plain text character U+FFFD")
-        << QString::fromUtf8("\xEF\xBF\xBD")
+        << QString::fromUtf8("x\xEF\xBF\xBDx")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Ideographic description character U+2FF5")
-        << QString::fromUtf8("\xE2\xBF\xB5")
+        << QString::fromUtf8("x\xE2\xBF\xB5x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
@@ -441,22 +446,22 @@ void tst_QUrlInternal::nameprep_testsuite_data()
         << QString() << 0 << 0;
 
     QTest::newRow("Left-to-right mark U+200E")
-        << QString::fromUtf8("\xE2\x80\x8E")
-        << QString::fromUtf8("\xCC\x81")
+        << QString::fromUtf8("x\xE2\x80\x8Ex")
+        << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Deprecated U+202A")
-        << QString::fromUtf8("\xE2\x80\xAA")
-        << QString::fromUtf8("\xCC\x81")
+        << QString::fromUtf8("x\xE2\x80\xAA")
+        << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Language tagging character U+E0001")
-        << QString::fromUtf8("\xF3\xA0\x80\x81")
-        << QString::fromUtf8("\xCC\x81")
+        << QString::fromUtf8("x\xF3\xA0\x80\x81x")
+        << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
     QTest::newRow("Language tagging character U+E0042")
-        << QString::fromUtf8("\xF3\xA0\x81\x82")
+        << QString::fromUtf8("x\xF3\xA0\x81\x82x")
         << QString()
         << QString("Nameprep") << 0 << STRINGPREP_CONTAINS_PROHIBITED;
 
@@ -512,12 +517,6 @@ void tst_QUrlInternal::nameprep_testsuite()
     QFETCH(QString, out);
     QFETCH(QString, profile);
 
-    QEXPECT_FAIL("Left-to-right mark U+200E",
-                 "Investigate further", Continue);
-    QEXPECT_FAIL("Deprecated U+202A",
-                 "Investigate further", Continue);
-    QEXPECT_FAIL("Language tagging character U+E0001",
-                 "Investigate further", Continue);
     qt_nameprep(&in, 0);
     QCOMPARE(in, out);
 }
@@ -549,9 +548,9 @@ void tst_QUrlInternal::nameprep_highcodes_data()
             << QString() << 0 << 0;
     }
     {
-        QChar st[] = { 'D', 0xdb40, 0xdc20, 'o', 0xd834, 0xdd7a, '\'', 0x2060, 'h' };
+        QChar st[] = { 'D', 'o', '\'', 0x2060, 'h' };
         QChar se[] = { 'd', 'o', '\'', 'h' };
-        QTest::newRow("highcodes (D, U+E0020, o, U+1D17A, ', U+2060, h)")
+        QTest::newRow("highcodes (D, o, ', U+2060, h)")
             << QString(st, sizeof(st)/sizeof(st[0]))
             << QString(se, sizeof(se)/sizeof(se[0]))
             << QString() << 0 << 0;
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 84deb72696..529ddd95fe 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -255,18 +255,18 @@ void tst_QtJson::testNumbers()
             0,
             -1,
             1,
-            (1UL<<54),
-            (1UL<<55),
-            (1UL<<56),
-            -(1UL<<54),
-            -(1UL<<55),
-            -(1UL<<56),
-            (1UL<<54) - 1,
-            (1UL<<55) - 1,
-            (1UL<<56) - 1,
-            -((1UL<<54) - 1),
-            -((1UL<<55) - 1),
-            -((1UL<<56) - 1)
+            (1ll<<54),
+            (1ll<<55),
+            (1ll<<56),
+            -(1ll<<54),
+            -(1ll<<55),
+            -(1ll<<56),
+            (1ll<<54) - 1,
+            (1ll<<55) - 1,
+            (1ll<<56) - 1,
+            -((1ll<<54) - 1),
+            -((1ll<<55) - 1),
+            -((1ll<<56) - 1)
         };
         int n = sizeof(numbers)/sizeof(qint64);
 
@@ -292,18 +292,18 @@ void tst_QtJson::testNumbers()
             0,
             -1,
             1,
-            (1UL<<54),
-            (1UL<<55),
-            (1UL<<56),
-            -(1UL<<54),
-            -(1UL<<55),
-            -(1UL<<56),
-            (1UL<<54) - 1,
-            (1UL<<55) - 1,
-            (1UL<<56) - 1,
-            -((1UL<<54) - 1),
-            -((1UL<<55) - 1),
-            -((1UL<<56) - 1),
+            double(1ll<<54),
+            double(1ll<<55),
+            double(1ll<<56),
+            double(-(1ll<<54)),
+            double(-(1ll<<55)),
+            double(-(1ll<<56)),
+            double((1ll<<54) - 1),
+            double((1ll<<55) - 1),
+            double((1ll<<56) - 1),
+            double(-((1ll<<54) - 1)),
+            double(-((1ll<<55) - 1)),
+            double(-((1ll<<56) - 1)),
             1.1,
             0.1,
             -0.1,
diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 2250d0bb5e..25e5f03566 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -159,23 +159,6 @@ public slots:
     }
 };
 
-#ifndef QT_NO_EXCEPTIONS
-class QEventLoopTestException { };
-
-class ExceptionThrower : public QObject
-{
-    Q_OBJECT
-public:
-    ExceptionThrower() : QObject() { }
-public slots:
-    void throwException()
-    {
-        QEventLoopTestException e;
-        throw e;
-    }
-};
-#endif
-
 class tst_QEventLoop : public QObject
 {
     Q_OBJECT
@@ -183,9 +166,6 @@ private slots:
     // This test *must* run first. See the definition for why.
     void processEvents();
     void exec();
-#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM)
-    void throwInExec();
-#endif
     void reexec();
     void execAfterExit();
     void wakeUp();
@@ -322,53 +302,6 @@ void tst_QEventLoop::exec()
     }
 }
 
-#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM)
-// Exceptions need to be enabled for this test
-// Q_OS_WINCE_WM case: this platform doesn't support propagating exceptions through the event loop
-// Windows Mobile cannot handle cross library exceptions
-// qobject.cpp will try to rethrow the exception after handling
-// which causes gwes.exe to crash
-void tst_QEventLoop::throwInExec()
-{
-// exceptions compiled in, runtime tests follow.
-#if defined(Q_OS_LINUX)
-    // C++ exceptions can't be passed through glib callbacks.  Skip the test if
-    // we're using the glib event loop.
-    QByteArray dispatcher = QAbstractEventDispatcher::instance()->metaObject()->className();
-    if (dispatcher.contains("Glib")) {
-        QSKIP(
-            qPrintable(QString(
-                "Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n"
-                "Try running with QT_NO_GLIB=1 in environment."
-            ).arg(QString::fromLatin1(dispatcher)))
-        );
-    }
-#endif
-
-    {
-        // QEventLoop::exec() is exception safe
-        QEventLoop eventLoop;
-        int caughtExceptions = 0;
-
-        try {
-            ExceptionThrower exceptionThrower;
-            QTimer::singleShot(EXEC_TIMEOUT, &exceptionThrower, SLOT(throwException()));
-            (void) eventLoop.exec();
-        } catch (...) {
-            ++caughtExceptions;
-        }
-        try {
-            ExceptionThrower exceptionThrower;
-            QTimer::singleShot(EXEC_TIMEOUT, &exceptionThrower, SLOT(throwException()));
-            (void) eventLoop.exec();
-        } catch (...) {
-            ++caughtExceptions;
-        }
-        QCOMPARE(caughtExceptions, 2);
-    }
-}
-#endif
-
 void tst_QEventLoop::reexec()
 {
     QEventLoop loop;
diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro
index 4002a5c5ea..66a968b7c3 100644
--- a/tests/auto/corelib/tools/qlocale/test/test.pro
+++ b/tests/auto/corelib/tools/qlocale/test/test.pro
@@ -18,3 +18,4 @@ TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp
 
 win32:CONFIG+= insignificant_test # QTBUG-25284
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+blackberry:LIBS += -lpps
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 0f6015ebdc..0c4dde4b1a 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -75,6 +75,52 @@ extern "C" DWORD GetThreadLocale(void) {
 #    include <stdlib.h>
 #endif
 
+#ifdef Q_OS_BLACKBERRY
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/pps.h>
+
+static const char ppsLanguageLocalePath[] = "/pps/services/confstr/_CS_LOCALE";
+static const size_t ppsBufferSize = 256;
+
+static QByteArray readPpsValue(const char *ppsObject, int ppsFd)
+{
+    QByteArray result;
+    if (!ppsObject || ppsFd == -1)
+        return result;
+
+    char buffer[ppsBufferSize];
+
+    int bytes = read(ppsFd, buffer, ppsBufferSize - 1);
+    if (bytes == -1) {
+        qFatal("Failed to read Locale pps, errno=%d", errno);
+        return result;
+    }
+    // ensure data is null terminated
+    buffer[bytes] = '\0';
+
+    pps_decoder_t ppsDecoder;
+    pps_decoder_initialize(&ppsDecoder, 0);
+    if (pps_decoder_parse_pps_str(&ppsDecoder, buffer) == PPS_DECODER_OK) {
+        pps_decoder_push(&ppsDecoder, 0);
+        const char *ppsBuff;
+        if (pps_decoder_get_string(&ppsDecoder, ppsObject, &ppsBuff) == PPS_DECODER_OK) {
+            result = ppsBuff;
+        } else {
+            int val;
+            if (pps_decoder_get_int(&ppsDecoder, ppsObject, &val) == PPS_DECODER_OK)
+                result = QByteArray::number(val);
+        }
+    }
+
+    pps_decoder_cleanup(&ppsDecoder);
+
+    return result;
+}
+#endif // Q_OS_BLACKBERRY
+
 Q_DECLARE_METATYPE(QLocale::FormatType)
 
 class tst_QLocale : public QObject
@@ -86,6 +132,7 @@ public:
 
 private slots:
     void initTestCase();
+    void cleanupTestCase();
 #ifdef Q_OS_WIN
     void windowsDefaultLocale();
 #endif
@@ -152,6 +199,10 @@ private slots:
 private:
     QString m_decimal, m_thousand, m_sdate, m_ldate, m_time;
     QString m_sysapp;
+
+#ifdef Q_OS_BLACKBERRY
+    int m_languageFd;
+#endif
 };
 
 tst_QLocale::tst_QLocale()
@@ -173,6 +224,18 @@ void tst_QLocale::initTestCase()
     QVERIFY2(fi.exists() && fi.isExecutable(),
              qPrintable(QDir::toNativeSeparators(m_sysapp)
                         + QStringLiteral(" does not exist or is not executable.")));
+
+#ifdef Q_OS_BLACKBERRY
+    if ((m_languageFd = open(ppsLanguageLocalePath, O_RDONLY)) == -1)
+        QFAIL("Failed to open language pps.");
+#endif
+}
+
+void tst_QLocale::cleanupTestCase()
+{
+#ifdef Q_OS_BLACKBERRY
+    close(m_languageFd);
+#endif
 }
 
 void tst_QLocale::ctor()
@@ -462,6 +525,11 @@ void tst_QLocale::emptyCtor()
     QVERIFY2(runSysApp(m_sysapp, env, &defaultLoc, &errorMessage),
              qPrintable(errorMessage));
 
+#ifdef Q_OS_BLACKBERRY
+    QString locale = readPpsValue("_CS_LOCALE", m_languageFd);
+    QVERIFY2(runSysApp(m_sysapp, env, &locale, &errorMessage),
+             qPrintable(errorMessage));
+#else
     TEST_CTOR("C", "C")
     TEST_CTOR("bla", "C")
     TEST_CTOR("zz", "C")
@@ -499,6 +567,7 @@ void tst_QLocale::emptyCtor()
     TEST_CTOR("en/", defaultLoc.toLatin1())
     TEST_CTOR("asdfghj", defaultLoc.toLatin1());
     TEST_CTOR("123456", defaultLoc.toLatin1());
+#endif // Q_OS_BLACKBERRY
 
 #undef TEST_CTOR
 }
diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp b/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
index 0e243988e2..1ac3645349 100644
--- a/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
+++ b/tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
@@ -101,7 +101,7 @@ void tst_QMessageAuthenticationCode::result_data()
                                << QByteArray::fromHex("750c783e6ab0b503eaa86e310a5db738");
     QTest::newRow("rfc-md5-3") << QCryptographicHash::Md5
                                << QByteArray::fromHex("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
-                               << QByteArray(50, 0xdd)
+                               << QByteArray(50, char(0xdd))
                                << QByteArray::fromHex("56be34521d144c88dbb8c733f0e8b3f6");
 }
 
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 4856f52c55..75aed3bf8b 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -451,8 +451,8 @@ void tst_QGuiVariant::vector2D()
     QVariant variant;
     QVector2D vector = qvariant_cast<QVector2D>(variant);
     QVERIFY(vector.isNull());
-    variant.setValue(QVector2D(0.1, 0.2));
-    QCOMPARE(QVector2D(0.1, 0.2), qvariant_cast<QVector2D>(variant));
+    variant.setValue(QVector2D(0.1f, 0.2f));
+    QCOMPARE(QVector2D(0.1f, 0.2f), qvariant_cast<QVector2D>(variant));
 
     void *pvector = QMetaType::create(QVariant::Vector2D, 0);
     QVERIFY(pvector);
diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
index 91eeda34c3..34af962d36 100644
--- a/tests/auto/gui/qopengl/qopengl.pro
+++ b/tests/auto/gui/qopengl/qopengl.pro
@@ -8,3 +8,5 @@ TARGET = tst_qopengl
 QT += gui gui-private core-private testlib
 
 SOURCES   += tst_qopengl.cpp
+
+win32-msvc2010:contains(QT_CONFIG, angle):CONFIG += insignificant_test # QTBUG-31611
diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
index a381ba7b71..17be5e4c43 100644
--- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
+++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -75,8 +75,8 @@ private slots:
 void tst_QDnsLookup::initTestCase()
 {
     QTest::addColumn<QString>("tld");
-    QTest::newRow("normal") << ".test.macieira.org";
-    QTest::newRow("idn") << ".alqualond\xc3\xab.test.macieira.org";
+    QTest::newRow("normal") << ".test.qt-project.org";
+    QTest::newRow("idn") << ".alqualond\xc3\xab.test.qt-project.org";
 }
 
 QString tst_QDnsLookup::domainName(const QString &input)
@@ -153,8 +153,8 @@ void tst_QDnsLookup::lookup_data()
 
     QTest::newRow("ns-empty") << int(QDnsLookup::NS) << "" << int(QDnsLookup::InvalidRequestError) << "" << "" << "" << "" << "" << "" << "";
     QTest::newRow("ns-notfound") << int(QDnsLookup::NS) << "invalid.invalid" << int(QDnsLookup::NotFoundError) << "" << "" << "" << "" << "" << "" << "";
-    QTest::newRow("ns-single") << int(QDnsLookup::NS) << "ns-single" << int(QDnsLookup::NoError) << "" << "" << "" << "ns3.macieira.info." << "" << "" << "";
-    QTest::newRow("ns-multi") << int(QDnsLookup::NS) << "ns-multi" << int(QDnsLookup::NoError) << "" << "" << "" << "gondolin.macieira.info.;ns3.macieira.info." << "" << "" << "";
+    QTest::newRow("ns-single") << int(QDnsLookup::NS) << "ns-single" << int(QDnsLookup::NoError) << "" << "" << "" << "ns-foo.linpro.net." << "" << "" << "";
+    QTest::newRow("ns-multi") << int(QDnsLookup::NS) << "ns-multi" << int(QDnsLookup::NoError) << "" << "" << "" << "ns-bar.linpro.net.;ns-foo.linpro.net." << "" << "" << "";
 
     QTest::newRow("ptr-empty") << int(QDnsLookup::PTR) << "" << int(QDnsLookup::InvalidRequestError) << "" << "" << "" << "" << "" << "" << "";
     QTest::newRow("ptr-notfound") << int(QDnsLookup::PTR) << "invalid.invalid" << int(QDnsLookup::NotFoundError) << "" << "" << "" << "" << "" << "" << "";
diff --git a/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp b/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
index 84b63c7148..91b5d9292d 100644
--- a/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
+++ b/tests/auto/network/kernel/qdnslookup_appless/tst_qdnslookup_appless.cpp
@@ -56,7 +56,7 @@ private slots:
 void tst_QDnsLookup_Appless::noApplication()
 {
     QTest::ignoreMessage(QtWarningMsg, "QDnsLookup requires a QCoreApplication");
-    QDnsLookup dns(QDnsLookup::A, "a-single.test.macieira.org");
+    QDnsLookup dns(QDnsLookup::A, "a-single.test.qt-project.org");
     dns.lookup();
 }
 
@@ -66,7 +66,7 @@ void tst_QDnsLookup_Appless::recreateApplication()
     char **argv = 0;
     for (int i = 0; i < 10; ++i) {
         QCoreApplication app(argc, argv);
-        QDnsLookup dns(QDnsLookup::A, "a-single.test.macieira.org");
+        QDnsLookup dns(QDnsLookup::A, "a-single.test.qt-project.org");
         dns.lookup();
         if (!dns.isFinished()) {
             QObject::connect(&dns, SIGNAL(finished()),
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index ee6ea546f3..e81c7f71db 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -93,7 +93,7 @@
 
 #include "../../../network-settings.h"
 
-#define TEST_DOMAIN ".test.macieira.org"
+#define TEST_DOMAIN ".test.qt-project.org"
 
 
 class tst_QHostInfo : public QObject
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index e06285dc67..dd24f6757e 100644
--- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -389,6 +389,11 @@ void tst_QNetworkProxyFactory::genericSystemProxy()
     QCOMPARE(systemProxy.first().port(), static_cast<quint16>(port));
     qunsetenv(envVar);
 #else
+    Q_UNUSED(envVar)
+    Q_UNUSED(url)
+    Q_UNUSED(proxyType)
+    Q_UNUSED(hostName)
+    Q_UNUSED(port)
     QSKIP("Generic system proxy not available on this platform.");
 #endif
 }
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index b6b534b1da..c74edab9a2 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -334,12 +334,13 @@ static inline float qrandom() { return (rand() % 100) / 100.f; }
 void renderAScene(int w, int h)
 {
 #ifdef QT_OPENGL_ES_2
+            Q_UNUSED(w)
+            Q_UNUSED(h)
             QGLShaderProgram program;
             program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec2 pos; void main() { gl_Position = vec4(pos.xy, 1.0, 1.0); }");
             program.addShaderFromSourceCode(QGLShader::Fragment, "uniform lowp vec4 color; void main() { gl_FragColor = color; }");
             program.bindAttributeLocation("pos", 0);
             program.bind();
-            int colorId = program.uniformLocation("color");
 
             glEnableVertexAttribArray(0);
 
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 1f7582243e..1d57206a73 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -41,6 +41,7 @@ SUBDIRS=\
    windowsmobile \
    qaccessibility \
    qaccessibilitylinux \
+   qaccessibilitymac \
 
 !qtHaveModule(network): SUBDIRS -= \
    baselineexample \
@@ -63,7 +64,8 @@ wince*|!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility
 !mac: SUBDIRS -= \
            macgui \
            macnativeevents \
-           macplist
+           macplist \
+           qaccessibilitymac
 
 !embedded|wince*: SUBDIRS -= \
            qdirectpainter
diff --git a/tests/auto/other/qaccessibilitymac/qaccessibilitymac.pro b/tests/auto/other/qaccessibilitymac/qaccessibilitymac.pro
new file mode 100644
index 0000000000..5d81567f45
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/qaccessibilitymac.pro
@@ -0,0 +1,16 @@
+CONFIG += testcase
+TARGET = tst_qaccessibilitymac
+# LIBS += -framework Carbon
+QT += widgets testlib
+
+HEADERS += tst_qaccessibilitymac_helpers.h
+SOURCES += tst_qaccessibilitymac.cpp
+
+mac {
+    LIBS += -framework Security -framework AppKit -framework ApplicationServices
+    OBJECTIVE_SOURCES += tst_qaccessibilitymac_helpers.mm
+}
+
+
+requires(mac)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp
new file mode 100644
index 0000000000..25dd0d39dd
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.cpp
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QtWidgets>
+#include <QtTest/QtTest>
+#include <QtCore/qcoreapplication.h>
+
+#include "tst_qaccessibilitymac_helpers.h"
+
+QT_USE_NAMESPACE
+
+
+class AccessibleTestWindow : public QWidget
+{
+    Q_OBJECT
+public:
+    AccessibleTestWindow()
+    {
+        new QHBoxLayout(this);
+    }
+
+    void addWidget(QWidget* widget)
+    {
+        layout()->addWidget(widget);
+        widget->show();
+        QTest::qWaitForWindowExposed(widget);
+    }
+
+    void clearChildren()
+    {
+        qDeleteAll(children());
+        new QHBoxLayout(this);
+    }
+};
+
+class tst_QAccessibilityMac : public QObject
+{
+Q_OBJECT
+private slots:
+    void init();
+    void cleanup();
+
+    void lineEditTest();
+    void hierarchyTest();
+private:
+    AccessibleTestWindow *m_window;
+};
+
+
+void tst_QAccessibilityMac::init()
+{
+    m_window = new AccessibleTestWindow();
+    m_window->setWindowTitle("Test window");
+    m_window->show();
+    m_window->resize(400, 400);
+
+    QTest::qWaitForWindowExposed(m_window);
+}
+
+void tst_QAccessibilityMac::cleanup()
+{
+    delete m_window;
+}
+
+
+void tst_QAccessibilityMac::lineEditTest()
+{
+    if (!macNativeAccessibilityEnabled())
+        return;
+
+    QLineEdit *lineEdit = new QLineEdit(m_window);
+    lineEdit->setText("a11y test QLineEdit");
+    m_window->addWidget(lineEdit);
+    QVERIFY(QTest::qWaitForWindowExposed(m_window));
+    QCoreApplication::processEvents();
+    QVERIFY(testLineEdit());
+}
+
+void tst_QAccessibilityMac::hierarchyTest()
+{
+    if (!macNativeAccessibilityEnabled())
+        return;
+
+    QWidget *w = new QWidget(m_window);
+    m_window->addWidget(w);
+    QPushButton *b = new QPushButton(w);
+    w->setLayout(new QVBoxLayout());
+    w->layout()->addWidget(b);
+    b->setText("I am a button");
+
+    QVERIFY(QTest::qWaitForWindowExposed(m_window));
+    QCoreApplication::processEvents();
+    QVERIFY(testHierarchy());
+}
+
+QTEST_MAIN(tst_QAccessibilityMac)
+#include "tst_qaccessibilitymac.moc"
diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h
new file mode 100644
index 0000000000..ec5beab125
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtCore/QString>
+#include <QtCore/QPair>
+#include <QtWidgets/QWidget>
+
+
+#pragma once // Yeah, it's deprecated in general, but it's standard practice for Mac OS X.
+
+bool macNativeAccessibilityEnabled();
+bool trusted();
+bool testLineEdit();
+bool testHierarchy();
diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
new file mode 100644
index 0000000000..8620b7dd2f
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
@@ -0,0 +1,213 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// some versions of CALayer.h use 'slots' as an identifier
+#define QT_NO_KEYWORDS
+
+#include "tst_qaccessibilitymac_helpers.h"
+#include <QApplication>
+#include <QDebug>
+#include <unistd.h>
+
+#import <Cocoa/Cocoa.h>
+#import <ApplicationServices/ApplicationServices.h>
+
+bool macNativeAccessibilityEnabled()
+{
+    bool enabled = AXAPIEnabled();
+    if (!enabled)
+        qWarning() << "Accessibility is disabled (check System Preferences) skipping test.";
+    return enabled;
+}
+
+bool trusted()
+{
+    return AXIsProcessTrusted();
+}
+
+
+#define EXPECT(cond) \
+    if (!(cond)) { \
+        qWarning("Failure in %s, line: %d", __FILE__ , __LINE__); \
+        return false; \
+    } \
+
+
+@interface TestAXObject : NSObject
+{
+    AXUIElementRef reference;
+}
+    @property (readonly) NSString *role;
+    @property (readonly) NSString *description;
+    @property (readonly) NSString *value;
+    @property (readonly) CGRect rect;
+@end
+
+@implementation TestAXObject
+- (id) initWithAXUIElementRef: (AXUIElementRef) ref {
+    if ( self = [super init] ) {
+        reference = ref;
+        AXUIElementCopyAttributeValue(ref, kAXRoleAttribute, (CFTypeRef*)&_role);
+        AXUIElementCopyAttributeValue(ref, kAXDescriptionAttribute, (CFTypeRef*)&_description);
+        AXUIElementCopyAttributeValue(ref, kAXValueAttribute, (CFTypeRef*)&_value);
+        AXValueRef sizeValue;
+        AXUIElementCopyAttributeValue(ref, kAXSizeAttribute, (CFTypeRef*)&sizeValue);
+        AXValueGetValue(sizeValue, kAXValueCGSizeType, &_rect.size);
+        AXValueRef positionValue;
+        AXUIElementCopyAttributeValue(ref, kAXPositionAttribute, (CFTypeRef*)&positionValue);
+        AXValueGetValue(positionValue, kAXValueCGPointType, &_rect.origin);
+    }
+    return self;
+}
+
+- (AXUIElementRef) ref { return reference; }
+- (void) print {
+    NSLog(@"Accessible Object role: '%@', description: '%@', value: '%@', rect: '%@'", self.role, self.description, self.value, NSStringFromRect(self.rect));
+    NSLog(@"    Children: %ld", [self.childList count]);
+}
+
+- (NSArray*) windowList
+{
+    NSArray *list;
+    AXUIElementCopyAttributeValues(
+                reference,
+                kAXWindowsAttribute,
+                0, 100, /*min, max*/
+                (CFArrayRef *) &list);
+    return list;
+}
+
+- (NSArray*) childList
+{
+    NSArray *list;
+    AXUIElementCopyAttributeValues(
+                reference,
+                kAXChildrenAttribute,
+                0, 100, /*min, max*/
+                (CFArrayRef *) &list);
+    return list;
+}
+
+- (AXUIElementRef) findDirectChildByRole: (CFStringRef) role
+{
+    AXUIElementRef result = nil;
+    NSArray *childList = [self childList];
+    for (id child in childList) {
+        CFStringRef typeString;
+        AXUIElementCopyAttributeValue((AXUIElementRef)child, kAXRoleAttribute, (CFTypeRef*)&typeString);
+        if (CFStringCompare(typeString, role, 0) == 0) {
+            result = (AXUIElementRef) child;
+            break;
+        }
+    }
+    return result;
+}
+
+- (AXUIElementRef) parent
+{
+    AXUIElementRef p = nil;
+    AXUIElementCopyAttributeValue(reference, kAXParentAttribute, (CFTypeRef*)&p);
+    return p;
+}
+
+@end
+
+
+bool testLineEdit()
+{
+// not sure if this is needed. on my machine the calls succeed.
+//    NSString *path = @"/Users/frederik/qt5/qtbase/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.app/Contents/MacOS/tst_qaccessibilitymac";
+//    NSString *path = @"/Users/frederik/qt5/qtbase/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac.app";
+//    AXError e = AXMakeProcessTrusted((CFStringRef) path);
+//    NSLog(@"error: %i", e);
+
+    pid_t pid = getpid();
+    AXUIElementRef app = AXUIElementCreateApplication(pid);
+    EXPECT(app != nil);
+    TestAXObject *appObject = [[TestAXObject alloc] initWithAXUIElementRef: app];
+
+    NSArray *windowList = [appObject windowList];
+    // one window
+    EXPECT([windowList count] == 1);
+    AXUIElementRef windowRef = (AXUIElementRef) [windowList objectAtIndex: 0];
+    EXPECT(windowRef != nil);
+    TestAXObject *window = [[TestAXObject alloc] initWithAXUIElementRef: windowRef];
+
+    EXPECT([window rect].size.width == 400);
+    // height of window includes title bar
+    EXPECT([window rect].size.height >= 400);
+
+    // children of window:
+    AXUIElementRef lineEdit = [window findDirectChildByRole: kAXTextFieldRole];
+    EXPECT(lineEdit != nil);
+
+    TestAXObject *le = [[TestAXObject alloc] initWithAXUIElementRef: lineEdit];
+    EXPECT([[le value] isEqualToString:@"a11y test QLineEdit"]);
+    return true;
+}
+
+bool testHierarchy()
+{
+    pid_t pid = getpid();
+    AXUIElementRef app = AXUIElementCreateApplication(pid);
+    EXPECT(app != nil);
+    TestAXObject *appObject = [[TestAXObject alloc] initWithAXUIElementRef: app];
+
+    NSArray *windowList = [appObject windowList];
+    // one window
+    EXPECT([windowList count] == 1);
+    AXUIElementRef windowRef = (AXUIElementRef) [windowList objectAtIndex: 0];
+    EXPECT(windowRef != nil);
+    TestAXObject *window = [[TestAXObject alloc] initWithAXUIElementRef: windowRef];
+
+    // Because the plain widget is filtered out of the hierarchy, we expect the button
+    // to be a direct child of the window
+    AXUIElementRef buttonRef = [window findDirectChildByRole: kAXButtonRole];
+    EXPECT(buttonRef != nil);
+
+    TestAXObject *buttonObject = [[TestAXObject alloc] initWithAXUIElementRef: buttonRef];
+    TestAXObject *parentObject = [[TestAXObject alloc] initWithAXUIElementRef: [buttonObject parent]];
+
+    // check that the parent is a window
+    EXPECT([[parentObject role] isEqualToString: (NSString *)kAXWindowRole]);
+
+    return true;
+}
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index e36eaa5af2..0fe7c8ab75 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -1033,6 +1033,14 @@ void tst_QFileSystemModel::roleNames()
     QVERIFY(values.contains(roleName));
 }
 
+static inline QByteArray permissionRowName(bool readOnly, int permission)
+{
+    QByteArray result = readOnly ? QByteArrayLiteral("ro") : QByteArrayLiteral("rw");
+    result += QByteArrayLiteral("-0");
+    result += QByteArray::number(permission, 16);
+    return result;
+}
+
 void tst_QFileSystemModel::permissions_data()
 {
     QTest::addColumn<int>("permissions");
@@ -1043,11 +1051,10 @@ void tst_QFileSystemModel::permissions_data()
         QFile::ReadOwner,
         QFile::WriteOwner|QFile::ReadOwner,
     };
-#define ROW_NAME(i) qPrintable(QString().sprintf("%s-0%04x", readOnly ? "ro" : "rw", permissions[i]))
-    for (int readOnly = false ; readOnly <= true; ++readOnly)
-        for (size_t i = 0; i < sizeof permissions / sizeof *permissions; ++i)
-            QTest::newRow(ROW_NAME(i)) << permissions[i] << bool(readOnly);
-#undef ROW_NAME
+    for (size_t i = 0; i < sizeof permissions / sizeof *permissions; ++i) {
+        QTest::newRow(permissionRowName(false, permissions[i]).constData()) << permissions[i] << false;
+        QTest::newRow(permissionRowName(true, permissions[i]).constData()) << permissions[i] << true;
+    }
 }
 
 void tst_QFileSystemModel::permissions() // checks QTBUG-20503
diff --git a/tests/auto/widgets/styles/qstyle/qstyle.pro b/tests/auto/widgets/styles/qstyle/qstyle.pro
index 2b9268f35d..4d18971cc6 100644
--- a/tests/auto/widgets/styles/qstyle/qstyle.pro
+++ b/tests/auto/widgets/styles/qstyle/qstyle.pro
@@ -6,10 +6,7 @@ QT += widgets testlib
 SOURCES  += tst_qstyle.cpp
 
 wince* {
-   DEFINES += SRCDIR=\\\".\\\"
    addPixmap.files = task_25863.png
    addPixmap.path = .
    DEPLOYMENT += addPixmap
-} else {
-   DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index fc94f95f8e..94d2d22d96 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -250,9 +250,12 @@ void tst_QStyle::testProxyStyle()
 void tst_QStyle::drawItemPixmap()
 {
     testWidget->resize(300, 300);
-    testWidget->show();
+    testWidget->showNormal();
 
-    QPixmap p(QString(SRCDIR) + "/task_25863.png", "PNG");
+    const QString imageFileName = QFINDTESTDATA("task_25863.png");
+    QVERIFY(!imageFileName.isEmpty());
+
+    QPixmap p(imageFileName, "PNG");
     const QPixmap actualPix = testWidget->grab();
 
     QCOMPARE(actualPix, p);
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 2ca42e3d08..f26af0e1f4 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2045,10 +2045,11 @@ void tst_QComboBox::itemListPosition()
     //we test QFontComboBox because it has the specific behaviour to set a fixed size
     //to the list view
     QWidget topLevel;
-    topLevel.resize(200, 200);
-    topLevel.move(100, 100);
+    QHBoxLayout *layout = new QHBoxLayout(&topLevel);
+
     QFontComboBox combo(&topLevel);
 
+    layout->addWidget(&combo);
     //the code to get the available screen space is copied from QComboBox code
     const int scrNumber = QApplication::desktop()->screenNumber(&combo);
 
@@ -2059,11 +2060,12 @@ void tst_QComboBox::itemListPosition()
                          QApplication::desktop()->screenGeometry(scrNumber) :
                          QApplication::desktop()->availableGeometry(scrNumber);
 
-    combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo to the top-right corner
+    topLevel.move(screen.width() - topLevel.sizeHint().width() - 10, 0); //puts the combo to the top-right corner
 
     topLevel.show();
+
     //wait because the window manager can move the window if there is a right panel
-    QTRY_VERIFY(combo.isVisible());
+    QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
     combo.showPopup();
     QTRY_VERIFY(combo.view());
     QTRY_VERIFY(combo.view()->isVisible());
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 6ab7cb4491..a4ad18c7a6 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -347,7 +347,9 @@ void tst_QDockWidget::features()
 
 void tst_QDockWidget::setFloating()
 {
+    const QRect deskRect = QApplication::desktop()->availableGeometry();
     QMainWindow mw;
+    mw.move(deskRect.left() + deskRect.width() * 2 / 3, deskRect.top() + deskRect.height() / 3);
     QDockWidget dw;
     mw.addDockWidget(Qt::LeftDockWidgetArea, &dw);
 
@@ -355,10 +357,16 @@ void tst_QDockWidget::setFloating()
     QVERIFY(QTest::qWaitForWindowExposed(&mw));
 
     QVERIFY(!dw.isFloating());
+    const QPoint dockedPosition = dw.mapToGlobal(dw.pos());
 
     QSignalSpy spy(&dw, SIGNAL(topLevelChanged(bool)));
 
     dw.setFloating(true);
+    const QPoint floatingPosition = dw.pos();
+
+    // QTBUG-31044, show approximately at old position, give or take window frame.
+    QVERIFY((dockedPosition - floatingPosition).manhattanLength() < 50);
+
     QVERIFY(dw.isFloating());
     QCOMPARE(spy.count(), 1);
     QCOMPARE(spy.at(0).value(0).toBool(), dw.isFloating());
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index 6b4bc3cd35..26f49a3fed 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1705,8 +1705,8 @@ void tst_QDom::germanUmlautToByteArray() const
     QByteArray baseline("<a");
 
     /* http://www.fileformat.info/info/unicode/char/00FC/index.htm */
-    baseline += 0xC3;
-    baseline += 0xBC;
+    baseline += char(0xC3);
+    baseline += char(0xBC);
     baseline += "b/>\n";
 
     QCOMPARE(data, baseline);