diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-12 12:46:42 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-12 12:46:42 (GMT) |
| commit | d1c5cfe2988daa61d74226f7d4df11b87efce429 (patch) | |
| tree | 11a5eb7106300aa0caf84447cbac6fc6b40b2974 /doc/src/snippets | |
| parent | 1618a06367f4282b0eb308b4ba1acbcdc609689b (diff) | |
| parent | 98fb861cf4611f9cada3d80ef93647669dfad165 (diff) | |
| download | Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.zip Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.tar.gz Qt-d1c5cfe2988daa61d74226f7d4df11b87efce429.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/picture/picture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp index a57de9d..d9e38ed 100644 --- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp +++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp @@ -6,7 +6,7 @@ public: { qreal penWidth = 1; return QRectF(-10 - penWidth / 2, -10 - penWidth / 2, - 20 + penWidth / 2, 20 + penWidth / 2); + 20 + penWidth, 20 + penWidth); } void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp index 07cedbf..be171c6 100644 --- a/doc/src/snippets/picture/picture.cpp +++ b/doc/src/snippets/picture/picture.cpp @@ -66,7 +66,7 @@ int main() QPicture picture; picture.load("drawing.pic"); // load picture QPainter painter; - painter.begin(&myWidget); // paint in myWidget + painter.begin(&myImage); // paint in myImage painter.drawPicture(0, 0, picture); // draw the picture at (0,0) painter.end(); // painting done //! [1] |