Accepting request 713347 from KDE:Qt:5.13

- Add patch to work around focus issues with VirtualBox
  (boo#1140084, QTBUG-76742):
  * 0001-Decrease-focusInTimer-timer-from-400-to-200.patch

- Link from Qt bindir into %_bindir, not the other way around to fix
  applicationDirPath called from Qt binaries
- Add -qt5 suffix to all binaries in %_bindir

OBS-URL: https://build.opensuse.org/request/show/713347
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=98

0001-Decrease-focusInTimer-timer-from-400-to-200.patch

@@ -0,0 +1,26 @@
+From 75a6b34e363f20664828f2e276de468a2ad4c9a6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Wed, 3 Jul 2019 20:55:27 +0200
+Subject: [PATCH] Decrease focusInTimer timer from 400 to 200
+
+Workaround for focus issues with VirtualBox (QTBUG-76742).
+---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9382488b74..a449ad8349 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
+     connection()->setFocusWindow(nullptr);
+     relayFocusToModalWindow();
+     // Do not set the active window to nullptr if there is a FocusIn coming.
+-    connection()->focusInTimer().start(400);
++    connection()->focusInTimer().start(200);
+ }
+ 
+ struct QtMotifWmHints {
+-- 
+2.22.0
+

libqt5-qtbase.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jul  3 18:57:26 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Add patch to work around focus issues with VirtualBox
+  (boo#1140084, QTBUG-76742):
+  * 0001-Decrease-focusInTimer-timer-from-400-to-200.patch
+
+-------------------------------------------------------------------
+Tue Jul  2 13:45:37 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Link from Qt bindir into %_bindir, not the other way around to fix
+  applicationDirPath called from Qt binaries
+- Add -qt5 suffix to all binaries in %_bindir
+
 -------------------------------------------------------------------
 Wed Jun 26 12:20:32 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtbase.spec

@@ -81,6 +81,8 @@ Patch50:        0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch
 Patch51:        0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch
 Patch52:        0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch
 Patch53:        0001-Revert-qmake-link-qt-libraries-by-full-path.patch
+# Workaround for QTBUG-76742, boo#1140084
+Patch60:        0001-Decrease-focusInTimer-timer-from-400-to-200.patch
 # patches 1000-2000 and above from upstream 5.13 branch #
 Patch1000:      0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch
 # patches 2000-3000 and above from upstream 5.14/dev branch #
@@ -962,19 +964,18 @@ rm -fv %{buildroot}%{libqt5_libdir}/cmake/Qt5*/Q*Plugin.cmake
 # This is only for Apple platforms and has a python2 dep
 rm -r %{buildroot}%{libqt5_archdatadir}/mkspecs/features/uikit
 
-# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir
+# Link all the binaries with -qt5 suffix to %{_bindir}
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{libqt5_bindir}
 for i in * ; do
   case "${i}" in
     moc|qdbuscpp2xml|qdbusxml2cpp|qmake|rcc|syncqt|uic)
-      mv $i ../../../bin/${i}-qt5
-      ln -s ../../../bin/${i}-qt5 .
-      ln -s ../../../bin/${i}-qt5 $i
+      ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
       ;;
    *)
-      mv $i ../../../bin/
-      ln -s ../../../bin/$i .
+      # No conflict with Qt4, so keep the original name for compatibility
+      ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
+      ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
       ;;
   esac
 done