From cdb218a3e1c8a204664334891c433d5b461d42d2 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 13 Oct 2016 08:40:06 +0200
Subject: [PATCH] Debugger: Show raw object data for pixmap

"Separate display" can be triggered for QRasterPlatformPixmap on
the embeddded QImage.

Task-number: QTCREATORBUG-17107
Change-Id: Ib54a6f76f634b0dcf601836dc10609f212581d14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 share/qtcreator/debugger/qttypes.py              | 2 +-
 tests/manual/debugger/simple/simple_test_app.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 0d154a1e633..5ce5531c682 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -1043,7 +1043,7 @@ def qdump__QPixmap(d, value):
     else:
         (dummy, width, height) = d.split('pii', dataPtr)
         d.putValue('(%dx%d)' % (width, height))
-    d.putNumChild(0)
+    d.putPlainChildren(value)
 
 
 def qdump__QPoint(d, value):
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 631c9e08953..b1fbf257060 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -177,6 +177,7 @@ void dummyStatement(...) {}
 #include <QFont>
 #include <QLabel>
 #include <QPainter>
+#include <QPixmap>
 #include <QPainterPath>
 #include <QRegion>
 #include <QStandardItemModel>
@@ -1144,12 +1145,13 @@ namespace painting {
         pain.drawLine(2, 2, 130, 130);
         pain.end();
         QPixmap pm = QPixmap::fromImage(im);
+        QSize size = pm.size();
         BREAK_HERE;
         // Check im (200x200) QImage.
         // CheckType pain QPainter.
         // Check pm (200x200) QPixmap.
         // Continue.
-        dummyStatement(&im, &pm);
+        dummyStatement(&im, &pm, &size);
         #endif
     }