summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcomponent.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-20 00:24:56 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-20 00:24:56 (GMT)
commit8469dac4020bee03b2de55fae51a6228b7783be1 (patch)
tree3aecffa08efe3e6ebede98ebc4c0f171ca3f27d9 /src/declarative/qml/qmlcomponent.cpp
parent5a44a309ff4d888c57a5648198be6996cdef4c80 (diff)
parent8b58eecf83811044edfc28bb652c605ab5446a07 (diff)
downloadQt-8469dac4020bee03b2de55fae51a6228b7783be1.zip
Qt-8469dac4020bee03b2de55fae51a6228b7783be1.tar.gz
Qt-8469dac4020bee03b2de55fae51a6228b7783be1.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
-rw-r--r--src/declarative/qml/qmlcomponent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index c30efca..0e141da 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -85,7 +85,7 @@ int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status");
Item {
Component {
id: RedSquare
- Rect {
+ Rectangle {
color: "red"
width: 10
height: 10