Merge remote branch 'staging/master' into refactor

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/glxconvenience/qglxconvenience.cpp
	src/plugins/platforms/platforms.pro
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/plugins/platforms/xcb/qxcbwindowsurface.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	tests/auto/qvariant/tst_qvariant.cpp

3 files changed, 29 insertions, 27 deletions

diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index 1ba03dced6..9999d9a9bc 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -50,6 +50,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 #include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 
 #ifdef Q_OS_SYMBIAN
 #define DEFAULT_MAKESPEC "X:/STLsupport/mkspecs/symbian-abld/"
@@ -342,7 +343,8 @@ namespace QTest {
 
     void QExternalTestPrivate::removeTemporaryDirectory()
     {
-        Q_ASSERT(!temporaryDir.isEmpty());
+        if (temporaryDir.isEmpty())
+            qWarning() << "Temporary directory is expected to be non-empty";
         removeRecursive(temporaryDir);
         temporaryDir.clear();
     }
@@ -369,8 +371,6 @@ namespace QTest {
             sourceCode += "#include <QtOpenGL/QtOpenGL>\n";
         if (qtModules & QExternalTest::QtSql)
             sourceCode += "#include <QtSql/QtSql>\n";
-        if (qtModules & QExternalTest::Qt3Support)
-            sourceCode += "#include <Qt3Support/Qt3Support>\n";
         if (qtModules & QExternalTest::QtSvg)
             sourceCode += "#include <QtSvg/QtSvg>\n";
         if (qtModules & QExternalTest::QtScript)
@@ -487,7 +487,8 @@ namespace QTest {
 
     bool QExternalTestPrivate::createProjectFile()
     {
-        Q_ASSERT(!temporaryDir.isEmpty());
+        if (temporaryDir.isEmpty())
+            qWarning() << "Temporary directory is expected to be non-empty";
 
         QFile projectFile(temporaryDir + QLatin1String("/project.pro"));
         if (!projectFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
@@ -540,8 +541,6 @@ namespace QTest {
             projectFile.write("QT += opengl\n");
         if (qtModules & QExternalTest::QtSql)
             projectFile.write("QT += sql\n");
-        if (qtModules & QExternalTest::Qt3Support)
-            projectFile.write("QT += qt3support\n");
         if (qtModules & QExternalTest::QtSvg)
             projectFile.write("QT += svg\n");
         if (qtModules & QExternalTest::QtScript)
@@ -599,7 +598,9 @@ namespace QTest {
 
     bool QExternalTestPrivate::runQmake()
     {
-        Q_ASSERT(!temporaryDir.isEmpty());
+        if (temporaryDir.isEmpty())
+            qWarning() << "Temporary directory is expected to be non-empty";
+
         if (!createProjectFile())
             return false;
 
@@ -633,7 +634,8 @@ namespace QTest {
 
     bool QExternalTestPrivate::runMake(Target target)
     {
-        Q_ASSERT(!temporaryDir.isEmpty());
+        if (temporaryDir.isEmpty())
+            qWarning() << "Temporary directory is expected to be non-empty";
 
         QExternalProcess make;
         make.setWorkingDirectory(temporaryDir);
diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h
index ca20cb0c30..1bf642abb6 100644
--- a/tests/auto/qsharedpointer/externaltests.h
+++ b/tests/auto/qsharedpointer/externaltests.h
@@ -72,13 +72,12 @@ namespace QTest {
             QtXmlPatterns=0x0010,
             QtOpenGL    = 0x0020,
             QtSql       = 0x0040,
-            Qt3Support  = 0x0080,
-            QtSvg       = 0x0100,
-            QtScript    = 0x0200,
-            QtTest      = 0x0400,
-            QtDBus      = 0x0800,
-            QtWebKit    = 0x1000,
-            Phonon      = 0x2000 // odd man out
+            QtSvg       = 0x0080,
+            QtScript    = 0x0100,
+            QtTest      = 0x0200,
+            QtDBus      = 0x0400,
+            QtWebKit    = 0x0800,
+            Phonon      = 0x1000 // odd man out
         };
         Q_DECLARE_FLAGS(QtModules, QtModule)
 
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index bb04621b67..62502193b2 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -139,7 +139,8 @@ public:
 
     virtual ~Data()
     {
-        Q_ASSERT_X(generation > 0, "tst_QSharedPointer", "Double deletion!");
+        if (generation <= 0)
+            qFatal("tst_qsharedpointer: Double deletion!");
         generation = 0;
         ++destructorCounter;
     }
@@ -283,8 +284,8 @@ void tst_QSharedPointer::operators()
     QSharedPointer<char> p1;
     QSharedPointer<char> p2(new char);
     qptrdiff diff = p2.data() - p1.data();
-    Q_ASSERT(p1.data() != p2.data());
-    Q_ASSERT(diff != 0);
+    QVERIFY(p1.data() != p2.data());
+    QVERIFY(diff != 0);
 
     // operator-
     QCOMPARE(p2 - p1.data(), diff);
@@ -867,8 +868,8 @@ void tst_QSharedPointer::differentPointers()
     {
         DiffPtrDerivedData *aData = new DiffPtrDerivedData;
         Data *aBase = aData;
-        Q_ASSERT(aData == aBase);
-        Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
+        QVERIFY(aData == aBase);
+        QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
 
         QSharedPointer<Data> baseptr = QSharedPointer<Data>(aData);
         QSharedPointer<DiffPtrDerivedData> ptr = qSharedPointerCast<DiffPtrDerivedData>(baseptr);
@@ -885,8 +886,8 @@ void tst_QSharedPointer::differentPointers()
     {
         DiffPtrDerivedData *aData = new DiffPtrDerivedData;
         Data *aBase = aData;
-        Q_ASSERT(aData == aBase);
-        Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
+        QVERIFY(aData == aBase);
+        QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
 
         QSharedPointer<DiffPtrDerivedData> ptr = QSharedPointer<DiffPtrDerivedData>(aData);
         QSharedPointer<Data> baseptr = ptr;
@@ -908,8 +909,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers()
     {
         VirtualDerived *aData = new VirtualDerived;
         Data *aBase = aData;
-        Q_ASSERT(aData == aBase);
-        Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
+        QVERIFY(aData == aBase);
+        QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
 
         QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>(aData);
         QSharedPointer<Data> baseptr = qSharedPointerCast<Data>(ptr);
@@ -928,8 +929,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers()
     {
         VirtualDerived *aData = new VirtualDerived;
         Data *aBase = aData;
-        Q_ASSERT(aData == aBase);
-        Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
+        QVERIFY(aData == aBase);
+        QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase));
 
         QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>(aData);
         QSharedPointer<Data> baseptr = ptr;
@@ -1605,7 +1606,7 @@ void hashAndMapTest()
     QVERIFY(it != c.find(Key()));
 
     if (Ordered) {
-        Q_ASSERT(k0 < k1);
+        QVERIFY(k0 < k1);
 
         it = c.begin();
         QCOMPARE(it.key(), k0);