From: Andrew den Exter <andrew.den-exter@nokia.com>
Date: Tue, 3 Apr 2012 23:59:25 +0000 (+1000)
Subject: Remove workaround for QTBUG-22919.
X-Git-Tag: 071012131707~681
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a6a7540fa26570779dc4936f97df2bcbcd51dba;p=profile%2Fivi%2Fqtdeclarative.git

Remove workaround for QTBUG-22919.

Fixed in qtbase.

Change-Id: I2faff485d3aaf5639b211bd0a1b30bf9d37d2e69
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
---

diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index 89c0aec..a3199fb 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -254,9 +254,6 @@ namespace {
             decorations |= (backgroundColor.isValid() ? QQuickTextNode::Background : QQuickTextNode::NoDecoration);
 
             qreal ascent = glyphRun.rawFont().ascent();
-            // ### QTBUG-22919 The bounding rect returned by QGlyphRun appears to start on the
-            // baseline, move it by the ascent so all bounding rects are at baseline - ascent.
-            searchRect.translate(0, -ascent);
             insert(binaryTree, BinaryTreeNode(glyphRun, selectionState, searchRect, decorations,
                                               textColor, backgroundColor, position, ascent));
         }