1 files changed, 72 insertions, 42 deletions

diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
index 5ae10f9..03220a7 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
@@ -21,6 +21,8 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <coecntrl.h>
 #include "objectdump_symbian.h"
 
+#include <QtGui/private/qwidget_p.h> // to access QWExtra
+
 QT_BEGIN_NAMESPACE
 
 namespace ObjectDump
@@ -28,92 +30,118 @@ namespace ObjectDump
 namespace Symbian
 {
 
+QList<QByteArray> QAnnotatorWidget::annotation(const QObject& object)
+{
+    QList<QByteArray> result;
+
+    const QWidget* widget = qobject_cast<const QWidget*>(&object);
+    if (widget) {
+
+        const QWExtra* extra = qt_widget_private(const_cast<QWidget *>(widget))->extraData();
+
+        if (extra) {
+
+            QByteArray array;
+            QTextStream stream(&array);
+
+            stream << "widget (Symbian): ";
+            stream << "activated " << extra->activated << ' ';
+            stream << "disableBlit " << extra->disableBlit << ' ';
+
+            stream.flush();
+            result.append(array);
+        }
+    }
+
+    return result;
+}
+
 QList<QByteArray> QAnnotatorControl::annotation(const QObject& object)
 {
     QList<QByteArray> result;
-    
+
     const QWidget* widget = qobject_cast<const QWidget*>(&object);
-    if(widget) {
-     
+    if (widget) {
+
         const CCoeControl* control = widget->effectiveWinId();
-        if(control) {
-            
+        if (control) {
+
             QByteArray array;
             QTextStream stream(&array);
-            
+
             stream << "control: " << control << ' ';
             stream << "parent " << control->Parent() << ' ';
-            
-            if(control->IsVisible())
+
+            if (control->IsVisible())
                 stream << "visible ";
             else
                 stream << "invisible ";
-            
+
             stream << control->Position().iX << ',' << control->Position().iY << ' ';
             stream << control->Size().iWidth << 'x' << control->Size().iHeight;
-            
-            if(control->OwnsWindow())
+
+            if (control->OwnsWindow())
                 stream << " ownsWindow ";
-            
+
             stream.flush();
             result.append(array);
         }
     }
-    
+
     return result;
 }
 
 QList<QByteArray> QAnnotatorWindow::annotation(const QObject& object)
 {
     QList<QByteArray> result;
-        
+
     const QWidget* widget = qobject_cast<const QWidget*>(&object);
-    if(widget) {
-        
+    if (widget) {
+
         const CCoeControl* control = widget->effectiveWinId();
-        if(control) {
-            
-            RDrawableWindow& window = *(control->DrawableWindow());
-            
+        RDrawableWindow *window = 0;
+
+        if (control && (window = control->DrawableWindow())) {
+
             QByteArray array;
             QTextStream stream(&array);
-            
+
             stream << "window: ";
-            
+
             // ClientHandle() is available first in 5.0.
 #if !defined(__SERIES60_31__) && !defined(__S60_32__)
             if (QSysInfo::s60Version() > QSysInfo::SV_S60_3_2)
-				// Client-side window handle
-				// Cast to a void pointer so that log output is in hexadecimal format.
-				stream << "cli " << reinterpret_cast<const void*>(window.ClientHandle()) << ' ';
+                // Client-side window handle
+                // Cast to a void pointer so that log output is in hexadecimal format.
+                stream << "cli " << reinterpret_cast<const void*>(window->ClientHandle()) << ' ';
 #endif
 
             // Server-side address of CWsWindow object
             // This is useful for correlation with the window tree dumped by the window
             // server (see RWsSession::LogCommand).
             // Cast to a void pointer so that log output is in hexadecimal format.
-            stream << "srv " << reinterpret_cast<const void*>(window.WsHandle()) << ' ';
-            
-            stream << "group " << window.WindowGroupId() << ' ';
-            
+            stream << "srv " << reinterpret_cast<const void*>(window->WsHandle()) << ' ';
+
+            stream << "group " << window->WindowGroupId() << ' ';
+
             // Client-side handle to the parent window.
-            // Cast to a void pointer so that log output is in hexadecimal format. 
-            stream << "parent " << reinterpret_cast<const void*>(window.Parent()) << ' ';
-            
-            stream << window.Position().iX << ',' << window.Position().iY << ' ';
-            stream << '(' << window.AbsPosition().iX << ',' << window.AbsPosition().iY << ") ";
-            stream << window.Size().iWidth << 'x' << window.Size().iHeight << ' ';
-            
-            const TDisplayMode displayMode = window.DisplayMode();
+            // Cast to a void pointer so that log output is in hexadecimal format.
+            stream << "parent " << reinterpret_cast<const void*>(window->Parent()) << ' ';
+
+            stream << window->Position().iX << ',' << window->Position().iY << ' ';
+            stream << '(' << window->AbsPosition().iX << ',' << window->AbsPosition().iY << ") ";
+            stream << window->Size().iWidth << 'x' << window->Size().iHeight << ' ';
+
+            const TDisplayMode displayMode = window->DisplayMode();
             stream << "mode " << displayMode << ' ';
-            
-            stream << "ord " << window.OrdinalPosition();
-            
+
+            stream << "ord " << window->OrdinalPosition();
+
             stream.flush();
             result.append(array);
-        }    
+        }
     }
-    
+
     return result;
 }
 
@@ -121,12 +149,14 @@ QList<QByteArray> QAnnotatorWindow::annotation(const QObject& object)
 
 void addDefaultAnnotators_sys(QDumper& dumper)
 {
+    dumper.addAnnotator(new Symbian::QAnnotatorWidget);
     dumper.addAnnotator(new Symbian::QAnnotatorControl);
     dumper.addAnnotator(new Symbian::QAnnotatorWindow);
 }
 
 void addDefaultAnnotators_sys(QVisitor& visitor)
 {
+    visitor.addAnnotator(new Symbian::QAnnotatorWidget);
     visitor.addAnnotator(new Symbian::QAnnotatorControl);
     visitor.addAnnotator(new Symbian::QAnnotatorWindow);
 }