]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/blame - qt/patches/qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
Move all packages to root.
[people/pmueller/ipfire-3.x.git] / qt / patches / qt-everywhere-opensource-src-4.7.0-QTBUG-6185.patch
CommitLineData
378d39c4
SS
1From 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba Mon Sep 17 00:00:00 2001
2From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
3Date: Wed, 29 Sep 2010 14:02:10 +0200
4Subject: [PATCH] Fixes cursor shape when widget becomes native on X11.
5
6When a native window handle is created for a widget that has override
7cursor set, we should reset the cursor on the parent and set the cursor
8on the new window handle.
9
10Task-number: QTBUG-6185
11Reviewed-by: Olivier Goffart
12---
13 src/gui/kernel/qwidget_x11.cpp | 4 +++-
14 1 files changed, 3 insertions(+), 1 deletions(-)
15
16diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
17index e01489f..8d80e10 100644
18--- a/src/gui/kernel/qwidget_x11.cpp
19+++ b/src/gui/kernel/qwidget_x11.cpp
20@@ -889,8 +889,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
21 q->setWindowOpacity(maybeTopData()->opacity/255.);
22
23 }
24- } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
25+ } else if (q->internalWinId()) {
26 qt_x11_enforce_cursor(q);
27+ if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
28+ qt_x11_enforce_cursor(p);
29 }
30
31 if (extra && !extra->mask.isEmpty() && q->internalWinId())
32--
331.6.1
34