git » qt5-base.git » commit 177355c

Fix the fix

author Antonio Rojas
2019-06-30 14:58:42 UTC
committer Antonio Rojas
2019-06-30 14:58:42 UTC
parent ad38c6e51c5e6a45e2c00a79a5f548a68d610397

Fix the fix

PKGBUILD +1 -1
virtualbox-focus.patch +7 -6

diff --git a/PKGBUILD b/PKGBUILD
index 692d8b1..2f3360f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe'
             '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
             '9300d8ab7abe4145e92eea75178a26ad3d5a71b0646665c3776ca2c375dd1233'
-            'bbd38c3bdad29b6978f5b5514f9d6fd7c109bc2b47fed86bafe22e7d4c77b532')
+            '1d889d04cecd1883d3dc3d1ffd2ce9db91e5f61a58c918d29871f764f5aad5cd')
 
 prepare() {
   cd ${_pkgfqn}
diff --git a/virtualbox-focus.patch b/virtualbox-focus.patch
index 27cbef1..0093f32 100644
--- a/virtualbox-focus.patch
+++ b/virtualbox-focus.patch
@@ -1,12 +1,13 @@
 diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9382488b74..d87713db40 100644
+index 9382488b74..1bf1ab268d 100644
 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp
 +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -846,6 +846,7 @@ void QXcbWindow::doFocusIn()
- void QXcbWindow::doFocusOut()
- {
+@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
      connection()->setFocusWindow(nullptr);
-+    QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
      relayFocusToModalWindow();
      // Do not set the active window to nullptr if there is a FocusIn coming.
-     connection()->focusInTimer().start(400);
+-    connection()->focusInTimer().start(400);
++    connection()->focusInTimer().start(0);
+ }
+ 
+ struct QtMotifWmHints {