[qt/f12/master] - Wrong Cursor when widget become native on X11 (QTBUG-6185)

[Rex Dieter]

commit c488e08456e4ef5b3c23fac3f5ed4d39a85a1450
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 30 10:05:41 2010 -0500

    - Wrong Cursor when widget become native on X11 (QTBUG-6185)

 ...verywhere-opensource-src-4.7.0-QTBUG-6185.patch |   34 ++++++++++++++++++++
 qt.spec                                            |    9 +++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch b/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
new file mode 100644
index 0000000..0b99d08
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
@@ -0,0 +1,34 @@
+From 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba Mon Sep 17 00:00:00 2001
+From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
+Date: Wed, 29 Sep 2010 14:02:10 +0200
+Subject: [PATCH] Fixes cursor shape when widget becomes native on X11.
+
+When a native window handle is created for a widget that has override
+cursor set, we should reset the cursor on the parent and set the cursor
+on the new window handle.
+
+Task-number: QTBUG-6185
+Reviewed-by: Olivier Goffart
+---
+ src/gui/kernel/qwidget_x11.cpp |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
+index e01489f..8d80e10 100644
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+                 q->setWindowOpacity(maybeTopData()->opacity/255.);
+ 
+         }
+-    } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
++    } else if (q->internalWinId()) {
+         qt_x11_enforce_cursor(q);
++        if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
++            qt_x11_enforce_cursor(p);
+     }
+ 
+     if (extra && !extra->mask.isEmpty() && q->internalWinId())
+-- 
+1.6.1
+
diff --git a/qt.spec b/qt.spec
index bb0e7f0..09e3ce2 100644
--- a/qt.spec
+++ b/qt.spec
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -72,6 +72,9 @@ Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
 # upstream or security patches
 # https://bugs.webkit.org/show_bug.cgi?id=40567
 Patch100: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_gtk_init.patch
+# http://bugreports.qt.nokia.com/browse/QTBUG-6185
+# http://qt.gitorious.org/qt/staging/commit/9e9a7bc29319d52c3e563bc2c5282cb7e6890eba
+Patch101: qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
 Patch104: qt-everywhere-opensource-src-4.6.2-cve-2010-0051-lax-css-parsing-cross-domain-theft.patch
 Patch106: qt-everywhere-opensource-src-4.6.2-cve-2010-0656.patch
 Patch108: qt-everywhere-opensource-src-4.6.2-cve-2010-0648.patch
@@ -450,6 +453,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 
 # upstream patches
 %patch100 -p1 -b .qtwebkit_gtk_init
+%patch101 -p1 -b .QTBUG-6185
 
 # security fixes
 %patch104 -p1 -b .cve-2010-0051-lax-css-parsing-cross-domain-theft
@@ -1084,6 +1088,9 @@ fi
 
 
 %changelog
+* Thu Sep 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6.3-9
+- Wrong Cursor when widget become native on X11 (QTBUG-6185)
+
 * Tue Jul 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.3-8
 - use find_lang to package the qm files (#609749)
 - put the qm files into the correct subpackages