diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 15:46:28 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-17 15:46:28 +0200 |
| commit | 99fede9d683b312fa79f45aa60c38bcb143c38fd (patch) | |
| tree | 9a44eb984a8513270f23250f8d7750bdd9797266 /doc/src/snippets/code | |
| parent | fd36b47e8758562fc9ff350f292fc9ae9ed91d4e (diff) | |
| parent | daaaea2d79f37c7fa22eef174d6489939e965a8e (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
EABI and BWINS DEF file updates for Symbian
Further RVCT4 fixes for Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Fixed automatic patching of self-signed packages
Webkit got bigger, make it link again on armlink
Set library path properly for all systems
Make debugging floating point mistakes much easier.
Simplify docs a bit
Fix check for arm based systems
Fix option(recursive)
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_gui_text_qtextlayout.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp index ad5725e35a..13040ea2dc 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] |