diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-09 14:51:43 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 07:06:32 +0200 |
commit | eee32cfb55eaa39ca792796afde508a760022072 (patch) | |
tree | c734fa9d61627d90fc872718c550d20aa2a16961 /src/quick | |
parent | 02675dc0208d46e6e10880a3003bcca27ac9caeb (diff) |
Fix warning about assigned/unused variable.
Change-Id: I0c9a7c4bf52e5a1a81d5ac85fc594ad197e3b811
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index c4373e6be6..c48ea0fb07 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -806,7 +806,6 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) bool truncateHeight = false; truncated = false; elide = false; - int characterCount = 0; int unwrappedLineCount = 1; int maxLineCount = maximumLineCount(); height = 0; @@ -836,7 +835,6 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) truncated = true; truncateHeight = true; - characterCount = line.textStart() + line.textLength(); visibleCount -= 1; QTextLine previousLine = layout.lineAt(visibleCount - 1); @@ -853,7 +851,6 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) const QTextLine previousLine = line; line = layout.createLine(); if (!line.isValid()) { - characterCount = previousLine.textStart() + previousLine.textLength(); if (singlelineElide && visibleCount == 1 && previousLine.naturalTextWidth() > lineWidth) { // Elide a single previousLine of text if its width exceeds the element width. elide = true; @@ -887,7 +884,6 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) if (visibleCount == maxLineCount) { truncated = true; heightExceeded |= wrapped; - characterCount = line.textStart() + line.textLength(); if (multilineElide) { elide = true; |