diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-01-27 11:12:46 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-02-04 13:02:50 +0100 |
| commit | 93bdd5274621d2a6497df55c3f6e479e99cc69c4 (patch) | |
| tree | 012a3cdcc34a27cf982b6b0922d2573449e6372d | |
| parent | 207d3f9a3a4581dcf9e41f32900eff883c05e279 (diff) | |
| download | qt-creator-93bdd5274621d2a6497df55c3f6e479e99cc69c4.tar.gz | |
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>
| -rw-r--r-- | src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/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 a5febcab8f..6e8d65029d 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 f35376b0d4..c838d13b21 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 { |