forked from pool/libqt5-qtbase
f8de62b1dc
- Add patch to fix focus in some cases (QTBUG-77364): * 0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch - Add patches to improve OOTB experience with HiDPI (boo#1089932): - Includes fix to prevent crash with pixmap cursors on XRender-less X servers (bsc#1108889, QTBUG-66935) - Includes fix to load libGL.so.1 library if there's no libGL.so symlink (boo#1099874, QTBUG-67537) - Includes fix to allow to disable logging of XCB errors (boo#1115541, QTBUG-55167) (QT_DISABLE_PRINTER_DISCOVERY is no longer used) (fixes boo#1064872) - Add patch to fix plugin loading with newer MariaDB versions (boo#1080048): after dragging an icon on the desktop in plasma (QTBUG-66103, boo#1080044). OBS-URL: https://build.opensuse.org/request/show/731882 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtbase?expand=0&rev=21
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001
|
|
From: David Faure <david.faure@kdab.com>
|
|
Date: Mon, 9 Sep 2019 18:12:26 +0200
|
|
Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly
|
|
|
|
My commit 3e7463411e adjusted the focus widget by setting
|
|
QApplicationPrivate::focus_widget directly, while there is a method for
|
|
doing this properly, including setFocus_sys() and emitting signals.
|
|
|
|
Fixes: QTBUG-77364
|
|
Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4
|
|
---
|
|
src/widgets/kernel/qwidget.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
|
|
index cf5a81c204..6889c2e9e5 100644
|
|
--- a/src/widgets/kernel/qwidget.cpp
|
|
+++ b/src/widgets/kernel/qwidget.cpp
|
|
@@ -6204,7 +6204,7 @@ void QWidget::setFocusProxy(QWidget * w)
|
|
|
|
if (changingAppFocusWidget) {
|
|
QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
|
|
- QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
|
|
+ QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.22.0
|
|
|