From 93bdd5274621d2a6497df55c3f6e479e99cc69c4 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Mon, 27 Jan 2014 11:12:46 +0100
Subject: [PATCH] QmlDesigner.StatesEditor: fix warnings

Task-number: QTCREATORBUG-10955
Change-Id: I6a382ed7935463c71103ca51a0a5b4822ab8cfc0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 .../stateseditor/stateseditorimageprovider.cpp      | 13 ++++++++-----
 .../components/stateseditor/stateslist.qml          |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
index a5febcab8f6..6e8d65029de 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp
@@ -42,17 +42,20 @@ StatesEditorImageProvider::StatesEditorImageProvider()
 
 QImage StatesEditorImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    if (m_nodeInstanceView.isNull())
-        return QImage();
-
-    if (!m_nodeInstanceView->model())
-        return QImage(); //NodeInstanceView might be detached
 
     QSize newSize = requestedSize;
 
     if (newSize.isEmpty())
         newSize = QSize (100, 100);
 
+    if (m_nodeInstanceView.isNull() || !m_nodeInstanceView->model()) {
+        //NodeInstanceView might be detached
+        //Return white QImage
+        QImage image(newSize, QImage::Format_ARGB32);
+        image.fill(0xFFFFFFFF);
+        return image;
+    }
+
     QString imageId = id.split(QLatin1Char('-')).first();
     QImage image;
 
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index f35376b0d45..c838d13b21f 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -397,7 +397,6 @@ Rectangle {
     Component {
         id: underlay
         Item {
-            anchors.fill:parent
             property variant color: parent.color
             clip:true
             Rectangle {