summaryrefslogtreecommitdiff
path: root/share/qtcreator
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-07-17 14:17:55 +0200
committerTim Jenssen <tim.jenssen@digia.com>2014-07-22 11:27:35 +0200
commit9898ac50e10f427f0950a19bcd43417722f0df81 (patch)
tree6c2151ffcddf6fc6e43896bf816549024ff57a94 /share/qtcreator
parentf0b58a22ca3c2cff0d06b62c08539358cecbf2c9 (diff)
downloadqt-creator-9898ac50e10f427f0950a19bcd43417722f0df81.tar.gz
QmlDesigner: fix that an invalid root item refreshes the preview
Change-Id: I8d917dfd92261a88472bd49577731f5bcf468d49 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 9e100d0265..33931cbd70 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -392,8 +392,15 @@ QImage QuickItemNodeInstance::renderPreviewImage(const QSize &previewImageSize)
{
QRectF previewItemBoundingRect = boundingRect();
- if (previewItemBoundingRect.isValid() && quickItem())
- return designerSupport()->renderImageForItem(quickItem(), previewItemBoundingRect, previewImageSize);
+ if (previewItemBoundingRect.isValid() && quickItem()) {
+ if (quickItem()->isVisible()) {
+ return designerSupport()->renderImageForItem(quickItem(), previewItemBoundingRect, previewImageSize);
+ } else {
+ QImage transparentImage(previewImageSize, QImage::Format_ARGB32_Premultiplied);
+ transparentImage.fill(Qt::transparent);
+ return transparentImage;
+ }
+ }
return QImage();
}