Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7043 from Rmys/master

Browse Source 
qt5-5.13.1:ver.bump
This commit is contained in:
Rmys
2019-09-15 16:48:46 +03:00
committed by GitHub
parent 3c43317827 3fd15745a5
commit 021639a841
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-base/files/qtbug-77364.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 04290a4ce1..27773d5762 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);
}
}
desktop/toolkit/qt5/qt5-base/pspec.xml
+11 -4
View File
@@ -11,7 +11,7 @@
<Summary>Cross platform application and UI framework</Summary>
<Description>Cross platform application and UI development framework</Description>
<License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
<Archive sha1sum="68506e1d6a710f657fe9ddf4e8fec55ad845e81b" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtbase-everywhere-src-5.13.0.tar.xz</Archive>
<Archive sha1sum="238b552da6a7fcf40de3eb9b39609b33783bd582" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtbase-everywhere-src-5.13.1.tar.xz</Archive>
<AdditionalFiles>
<!-- <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile> -->
</AdditionalFiles>
@@ -78,9 +78,9 @@
<Patches>
<!-- Pisilinux Patches -->
<Patch>mkspecs.patch</Patch>
<Patch level="1">qtbase-qxcbwindow.patch</Patch>
<Patch level="1">qtbase-zlib-compression.patch</Patch>
<Patch level="1">virtualbox-focus.patch</Patch>
<Patch level="1">qtbug-77364.patch</Patch>
<!-- <Patch level="1">qtbase-zlib-compression.patch</Patch> -->
<!-- <Patch level="1">virtualbox-focus.patch</Patch> -->
</Patches>
</Source>
@@ -263,6 +263,13 @@
</Package>-->
<History>
<Update release="19">
<Date>2019-09-05</Date>
<Version>5.13.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2019-06-20</Date>
<Version>5.13.0</Version>