diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
| commit | c5845e6ea9cafea836038e24e6072aaed8242ef1 (patch) | |
| tree | b361ec57fa22c38d509bb177fe323140dade5219 /doc/src/snippets/code | |
| parent | b2d43b06d1c1debcd42afbc7dfd85c4991c670d5 (diff) | |
| parent | 3d05a836cb0bc62e6dc31d297bada07ec60adc34 (diff) | |
| download | Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.zip Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.gz Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 9 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 8730125..d698f4a 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -137,6 +137,15 @@ configure -platform win32-mwc -xplatform symbian-abld make debug-winscw //! [24] +//! [25] +cd examples +qmake +make +cd ..\demos +qmake +make +//! [25] + //! [26] wiggly.exe -small-screen 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, |