Revert "Revert all GUI changes from the MMF work."

This reverts commit 9345d47c3945b61a27724508e8b3d0aaf7b57bcf.

1 files changed, 10 insertions, 3 deletions

diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 296c5b1..2a81689 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -169,9 +169,6 @@ struct QTLWExtra {
 #ifndef QT_NO_QWS_MANAGER
     QWSManager *qwsManager;
 #endif
-#elif defined(Q_OS_SYMBIAN) // <--------------------------------------------------------- SYMBIAN
-    uint activated : 1; // RWindowBase::Activated has been called
-    RDrawableWindow *rwindow;
 #endif
 };
 
@@ -224,6 +221,15 @@ struct QWExtra {
     QImage maskBits;
     CGImageRef imageMask;
 #endif
+#elif defined(Q_OS_SYMBIAN) // <----------------------------------------------------- Symbian
+    uint activated : 1; // RWindowBase::Activated has been called
+
+    // If set, QSymbianControl::Draw does not blit this widget
+    // This is to allow, for use cases such as video, widgets which, from the Qt point
+    // of view, are just placeholders in the scene.  For these widgets, any necessary
+    // drawing to the UI framebuffer is done by the relevant Symbian subsystem.  For
+    // video rendering, this would be an MMF controller, or MDF post-processor.
+    uint disableBlit : 1;
 #endif
 };
 
@@ -288,6 +294,7 @@ public:
     void setMask_sys(const QRegion &);
 #ifdef Q_OS_SYMBIAN
     void handleSymbianDeferredFocusChanged();
+    void setSoftKeys_sys(const QList<QAction*> &softkeys);
 #endif
 
     void raise_sys();