Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

2 files changed, 3 insertions, 47 deletions

diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
index 54c07a2..1952796 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -1194,6 +1194,9 @@ void tst_QTextScriptEngine::mirroredChars_data()
 
 void tst_QTextScriptEngine::mirroredChars()
 {
+#if defined(Q_WS_MAC)
+    QSKIP("Not supported on Mac", SkipAll);
+#endif
     QFETCH(int, hintingPreference);
 
     QFont font;
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index b309917..4e3435e 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -82,8 +82,6 @@ public:
         /* nothing */
     }
 
-    using QWindowSurface::setStaticContentsSupport;
-    using QWindowSurface::setPartialUpdateSupport;
 private:
     QImage image;
 };
@@ -283,51 +281,6 @@ void tst_QWindowSurface::grabWidget()
     QVERIFY(QColor(childInvalidSubImage.pixel(0, 0)) == QColor(Qt::white));
 }
 
-void tst_QWindowSurface::staticContentsAndPartialUpdateSupport()
-{
-    QWidget widget;
-    MyWindowSurface surface(&widget);
-
-    // Default values.
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: YES
-    surface.setStaticContentsSupport(true);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(surface.hasStaticContentsSupport());
-
-    // Static contents requires support for partial updates.
-    // We simply ingore bad combinations and spit out a warning.
-
-    // CONFLICT: Partial: NO, Static: YES
-    QTest::ignoreMessage(QtWarningMsg, "QWindowSurface::setPartialUpdateSupport: static contents support requires partial update support");
-    surface.setPartialUpdateSupport(false);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: NO
-    surface.setStaticContentsSupport(false);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: NO, Static: NO
-    surface.setPartialUpdateSupport(false);
-    QVERIFY(!surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // CONFLICT: Partial: NO, Static: YES
-    QTest::ignoreMessage(QtWarningMsg, "QWindowSurface::setStaticContentsSupport: static contents support requires partial update support");
-    surface.setStaticContentsSupport(true);
-    QVERIFY(!surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-
-    // Partial: YES, Static: NO
-    surface.setPartialUpdateSupport(true);
-    QVERIFY(surface.hasPartialUpdateSupport());
-    QVERIFY(!surface.hasStaticContentsSupport());
-}
-
 QTEST_MAIN(tst_QWindowSurface)
 
 #else // Q_WS_MAC