diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 01:26:53 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 01:26:53 (GMT) |
| commit | e7041de4d51a3166948924fc8640c8c6bc8daa7b (patch) | |
| tree | c49930ffb3103a8caae296d391e71fcc3fded7a8 /src/declarative | |
| parent | bc7dca6516a71118c73fcd84dc80cd5a8ba9eaa8 (diff) | |
| parent | ad7c537fbd4b5060141233d06b916407d7eb920f (diff) | |
| download | Qt-e7041de4d51a3166948924fc8640c8c6bc8daa7b.zip Qt-e7041de4d51a3166948924fc8640c8c6bc8daa7b.tar.gz Qt-e7041de4d51a3166948924fc8640c8c6bc8daa7b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index 070c70f..2fbf18b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -2070,10 +2070,6 @@ void QmlGraphicsItem::setBaselineOffset(qreal offset) color: "blue" width: 100; height: 100 Rectangle { - color: "green" - width: 25; height: 25 - } - Rectangle { color: "red" x: 25; y: 25; width: 50; height: 50 rotation: 30 |