summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp3
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index b82fb53..8fbaa22 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -228,13 +228,12 @@ QDeclarativePen *QDeclarativeRectangle::border()
GradientStop { position: 1.0; color: "blue" }
}
}
- Rectangle { rotation: 90; x: 80; y: 200; width: 80; height: 80
+ Rectangle { rotation: 90; y: 200; width: 80; height: 80
gradient: Gradient {
GradientStop { position: 0.0; color: "lightsteelblue" }
GradientStop { position: 1.0; color: "blue" }
}
}
- // The x offset is needed because the rotation is from the top left corner
\endqml
\endtable
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 1a28176..ce7681a 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -1273,6 +1273,8 @@ void ModelNode::setObjectValue(const QScriptValue& valuemap) {
value->setListValue(v);
} else {
value->values << v.toVariant();
+ if (objectCache)
+ objectCache->setValue(it.name().toUtf8(), value->values.last());
}
if (properties.contains(it.name()))
delete properties[it.name()];