diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-06-07 16:10:46 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-06-07 16:10:46 (GMT) |
| commit | d26856959f5031c03ed245df5aa9cb3b15a0596b (patch) | |
| tree | 8484a674a9acb81d18c5a01ef9f2445c2a2a81b0 /src/declarative/graphicsitems/qdeclarativepath.cpp | |
| parent | 0c0f22ec0e36d7001c8195dcc6e390a37118e33e (diff) | |
| parent | bf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff) | |
| download | Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.zip Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.gz Qt-d26856959f5031c03ed245df5aa9cb3b15a0596b.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-staging1
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepath.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepath.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp index 141a938..a904869 100644 --- a/src/declarative/graphicsitems/qdeclarativepath.cpp +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp @@ -628,7 +628,7 @@ void QDeclarativePathLine::addToPath(QPainterPath &path) \qml Path { startX: 0; startY: 0 - PathQuad x: 200; y: 0; controlX: 100; controlY: 150 } + PathQuad { x: 200; y: 0; controlX: 100; controlY: 150 } } \endqml \endtable @@ -713,8 +713,9 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path) Path { startX: 20; startY: 0 PathCubic { - x: 180; y: 0; control1X: -10; control1Y: 90 - control2X: 210; control2Y: 90 + x: 180; y: 0 + control1X: -10; control1Y: 90 + control2X: 210; control2Y: 90 } } \endqml |