From eee32cfb55eaa39ca792796afde508a760022072 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 9 Jul 2012 14:51:43 +0200
Subject: [PATCH] Fix warning about assigned/unused variable.

Change-Id: I0c9a7c4bf52e5a1a81d5ac85fc594ad197e3b811
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
---
 src/quick/items/qquicktext.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index c4373e6..c48ea0f 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;
-- 
2.7.4