summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_gui_text_qtextlayout.cpp
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-04-28 09:49:37 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-04-28 09:49:37 (GMT)
commite393f03cb89c795e4a638f84b002cb16fd1613a7 (patch)
tree1f9272e1dcf9f162682e9c3571ffb0e6aded1618 /doc/src/snippets/code/src_gui_text_qtextlayout.cpp
parent1f00130097f81bc78aebb3c055f38c066221bc98 (diff)
parent3eded761167af317bab4f4d8c1ac0a12433eb03a (diff)
downloadQt-e393f03cb89c795e4a638f84b002cb16fd1613a7.zip
Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.tar.gz
Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.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/src_gui_text_qtextlayout.cpp')
-rw-r--r--doc/src/snippets/code/src_gui_text_qtextlayout.cpp2
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 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]