From f234732de9daa42a29be25445c819bc71dcd0e07 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Mon, 4 Nov 2019 00:17:31 +0100 Subject: [PATCH] up to 5.13.2 --- qt5-qtbase.spec | 10 ++++------ qtbug-77364.patch | 35 ----------------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 qtbug-77364.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index e887b69..8b4a178 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -65,18 +65,17 @@ Summary: Qt5 - base components Summary(pl.UTF-8): Biblioteka Qt5 - podstawowe komponenty Name: qt5-%{orgname} -Version: 5.13.1 -Release: 3 +Version: 5.13.2 +Release: 1 # See LGPL_EXCEPTION.txt for exception details License: LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3 Group: X11/Libraries Source0: http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz -# Source0-md5: 0a1761145531b74fff5b4d9a80c7b1c2 +# Source0-md5: 3735b864b716ca94fe1d7ebcd94101f0 Source1: http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz -# Source1-md5: 8f2e2ce52c296a1bfd814610770663ae +# Source1-md5: fea07dab5b04fe170fc06987f4fd0b0f Patch0: %{name}-system_cacerts.patch Patch1: qdoc_default_incdirs.diff -Patch2: qtbug-77364.patch URL: http://www.qt.io/ %{?with_directfb:BuildRequires: DirectFB-devel} BuildRequires: EGL-devel @@ -1178,7 +1177,6 @@ Generator plików makefile dla aplikacji Qt5. %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf diff --git a/qtbug-77364.patch b/qtbug-77364.patch deleted file mode 100644 index 54b0969..0000000 --- a/qtbug-77364.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 947883141d9d8b3079a8a21981ad8a5ce3c4798e Mon Sep 17 00:00:00 2001 -From: David Faure -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 -Reviewed-by: Florian Bruhin -Reviewed-by: Volker Hilsheimer -Reviewed-by: Allan Sandfeld Jensen -Reviewed-by: Shawn Rutledge ---- - 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 04290a4ce12..0fa59077449 100644 ---- a/src/widgets/kernel/qwidget.cpp -+++ b/src/widgets/kernel/qwidget.cpp -@@ -6446,7 +6446,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.16.3 - -- 2.44.0