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>
This commit is contained in:
Thomas Hartmann
2014-01-27 11:12:46 +01:00
parent 207d3f9a3a
commit 93bdd52746
2 changed files with 8 additions and 6 deletions

View File

@@ -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;

View File

@@ -397,7 +397,6 @@ Rectangle {
Component {
id: underlay
Item {
anchors.fill:parent
property variant color: parent.color
clip:true
Rectangle {