diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-19 08:45:09 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-19 08:45:09 (GMT) |
| commit | 0bbf0c7c189e3a3fd7860aae86d2f62d4bc77014 (patch) | |
| tree | f9b0b9e50f70b8f24e29c1966ebd23ffa3377a40 /doc/src/snippets/code | |
| parent | bce9c47d5437812b137c47ff3c602ff23ffa5e22 (diff) | |
| parent | 5ce428cf7f20cd37f4cf0d92ddcceddd07c5a0db (diff) | |
| download | Qt-0bbf0c7c189e3a3fd7860aae86d2f62d4bc77014.zip Qt-0bbf0c7c189e3a3fd7860aae86d2f62d4bc77014.tar.gz Qt-0bbf0c7c189e3a3fd7860aae86d2f62d4bc77014.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 5 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_text_qtextlayout.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index d9e5d3c..5789662 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -886,7 +886,7 @@ TARGET.CAPABILITY += AllFiles //! [133] //! [134] -TARGET.CAPABILITY = ALL -TCB +TARGET.CAPABILITY = ALL -TCB -DRM -AllFiles //! [134] //! [135] diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 2d86f8c..77c67ab 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -374,10 +374,13 @@ Q_PROPERTY(type name READ getFunction [WRITE setFunction] [RESET resetFunction] + [NOTIFY notifySignal] [DESIGNABLE bool] [SCRIPTABLE bool] [STORED bool] - [USER bool]) + [USER bool] + [CONSTANT] + [FINAL]) //! [36] diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp index ad5725e..13040ea 100644 --- a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp +++ b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp @@ -42,7 +42,6 @@ //! [0] int leading = fontMetrics.leading(); qreal height = 0; -qreal widthUsed = 0; textLayout.beginLayout(); while (1) { QTextLine line = textLayout.createLine(); @@ -53,7 +52,6 @@ while (1) { height += leading; line.setPosition(QPointF(0, height)); height += line.height(); - widthUsed = qMax(widthUsed, line.naturalTextWidth()); } textLayout.endLayout(); //! [0] |