Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  A patch for 'Fix to QtOpenGL crash'
  Always recreate backing store when TLW transparency changes
  Crash in QDeclarativeCompiler::indexOfProperty
  Fix to QtOpenGL crash

1 files changed, 44 insertions, 1 deletions

diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 43dd077..2161f99 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -397,6 +397,9 @@ private slots:
     void minimizedWindowModeTransitions();
     void normalWindowModeTransitions();
     void focusSwitchClosesPopupMenu();
+#if !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+    void opacityChangeCausesBackingStoreRecreation();
+#endif
 #endif
 
     void focusProxyAndInputMethods();
@@ -10336,7 +10339,47 @@ void tst_QWidget::focusSwitchClosesPopupMenu()
     mainWindow.activateWindow();
     QVERIFY(!CEikonEnv::Static()->AppUiFactory()->MenuBar()->IsDisplayed());
 }
-#endif
+
+#if !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+class OpacityChangeWidget : public QWidget
+{
+public:
+    OpacityChangeWidget() : m_paintEngineType(QPaintEngine::MaxUser) { }
+    void paintEvent(QPaintEvent *)
+    {
+        QPainter painter(this);
+        m_paintEngineType = painter.paintEngine()->type();
+    }
+    QPaintEngine::Type paintEngineType() const { return m_paintEngineType; }
+private:
+    QPaintEngine::Type m_paintEngineType;
+};
+
+void tst_QWidget::opacityChangeCausesBackingStoreRecreation()
+{
+    OpacityChangeWidget w;
+    w.show();
+    QTest::qWaitForWindowShown(&w);
+    const QPaintEngine::Type type = w.paintEngineType();
+    if (QPaintEngine::OpenGL != type && QPaintEngine::OpenVG != type) {
+        QSKIP("Test case is only valid when using opengl or openvg graphics system", SkipAll);
+    } else {
+        if (QApplicationPrivate::instance()->useTranslucentEGLSurfaces) {
+            QSKIP("Test case is only valid when EGL surface transparency is not supported", SkipAll);
+        } else {
+            // Making window transparent should force switch to raster graphics system
+            w.setAttribute(Qt::WA_TranslucentBackground, true);
+            w.repaint();
+            QCOMPARE(w.paintEngineType(), QPaintEngine::Raster);
+            // Making window opaque should cause switch back to previous graphics system
+            w.setAttribute(Qt::WA_TranslucentBackground, false);
+            w.repaint();
+            QCOMPARE(w.paintEngineType(), type);
+        }
+    }
+}
+#endif // !Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
+#endif // Q_OS_SYMBIAN
 
 class InputContextTester : public QInputContext
 {