Merge branch 'master' into f17

qt-Fix-cursor-truncate-to-include-line-position.patch

@@ -0,0 +1,32 @@
+From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001
+From: Jiang Jiang <jiang.jiang@nokia.com>
+Date: Tue, 3 Jul 2012 10:17:49 +0200
+Subject: Fix cursor truncate to include line position
+
+Since we could have moved the line position (QTextLine::setPosition),
+the truncating position should be adjusted with that.
+
+Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
+---
+ src/gui/text/qtextlayout.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
+index 16f7150..52f2793 100644
+--- a/src/gui/text/qtextlayout.cpp
++++ b/src/gui/text/qtextlayout.cpp
+@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
+         x += eng->offsetInLigature(si, pos, end, glyph_pos);
+     }
+ 
+-    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width)
+-        x = line.width;
++    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width)
++        x = line.x + line.width;
+ 
+     *cursorPos = pos + si->position;
+     return x.toReal();
+-- 
+1.7.10.4
+

qt.spec

@@ -16,7 +16,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -117,6 +117,8 @@ Patch81: ./qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
 # upstream patches
 # http://codereview.qt-project.org/#change,22006
 Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
+# text cursor blinks not in the current cell (kde#296490)
+Patch101: qt-Fix-cursor-truncate-to-include-line-position.patch
 # fix crash on big endian machines
 # https://bugreports.qt-project.org/browse/QTBUG-22960
 Patch102: qt-everywhere-opensource-src-4.8.1-type.patch
@@ -461,6 +463,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 
 # upstream patches
 %patch100 -p1 -b .QTgaHandler
+%patch101 -p1 -b .fix_cursor_blink
 %patch102 -p1 -b .bigendian
 
 # security fixes
@@ -1093,6 +1096,9 @@ fi
 
 
 %changelog
+* Thu Jul 05 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.2-4
+- text cursor blinks not in the current cell (kde#296490)
+
 * Tue Jun 19 2012 Than Ngo <than@redhat.com> - 4.8.2-3
 - fix bz#810500, fix crash in assistant