Accepting request 754286 from home:Vogtinator:qt5.14
Qt 5.14.0 RC1 OBS-URL: https://build.opensuse.org/request/show/754286 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtbase?expand=0&rev=5
This commit is contained in:
parent
1ad784a5f0
commit
9ecf0d981a
@ -1,75 +0,0 @@
|
|||||||
From fa9728f19c8bf8ae925a1c99d056559b7bc84515 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
||||||
Date: Fri, 29 Jun 2018 09:15:51 +0200
|
|
||||||
Subject: [PATCH] Revert "QWidgetWindow: Immediately forward close events to
|
|
||||||
QWindow"
|
|
||||||
|
|
||||||
This reverts commit e0b5ff4ad583befbecbcbe462998e3ed80899531.
|
|
||||||
|
|
||||||
References: kde#395988
|
|
||||||
References: QTBUG-43344
|
|
||||||
---
|
|
||||||
src/widgets/kernel/qwidgetwindow.cpp | 1 -
|
|
||||||
.../widgets/kernel/qwidget/tst_qwidget.cpp | 28 -------------------
|
|
||||||
2 files changed, 29 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
|
|
||||||
index 1f3057b008..24e0173ac1 100644
|
|
||||||
--- a/src/widgets/kernel/qwidgetwindow.cpp
|
|
||||||
+++ b/src/widgets/kernel/qwidgetwindow.cpp
|
|
||||||
@@ -237,7 +237,6 @@ bool QWidgetWindow::event(QEvent *event)
|
|
||||||
switch (event->type()) {
|
|
||||||
case QEvent::Close:
|
|
||||||
handleCloseEvent(static_cast<QCloseEvent *>(event));
|
|
||||||
- QWindow::event(event);
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case QEvent::Enter:
|
|
||||||
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
|
|
||||||
index 6a049aedf1..c7dab650fe 100644
|
|
||||||
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
|
|
||||||
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
|
|
||||||
@@ -401,8 +401,6 @@ private slots:
|
|
||||||
|
|
||||||
void tabletTracking();
|
|
||||||
|
|
||||||
- void closeEvent();
|
|
||||||
-
|
|
||||||
private:
|
|
||||||
bool ensureScreenSize(int width, int height);
|
|
||||||
|
|
||||||
@@ -10800,31 +10798,5 @@ void tst_QWidget::tabletTracking()
|
|
||||||
QTRY_COMPARE(widget.moveEventCount, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
-class CloseCountingWidget : public QWidget
|
|
||||||
-{
|
|
||||||
-public:
|
|
||||||
- int closeCount = 0;
|
|
||||||
- void closeEvent(QCloseEvent *ev) override;
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
-void CloseCountingWidget::closeEvent(QCloseEvent *ev)
|
|
||||||
-{
|
|
||||||
- ++closeCount;
|
|
||||||
- ev->accept();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void tst_QWidget::closeEvent()
|
|
||||||
-{
|
|
||||||
- CloseCountingWidget widget;
|
|
||||||
- widget.show();
|
|
||||||
- QVERIFY(QTest::qWaitForWindowExposed(&widget));
|
|
||||||
- // Yes we call the close() function twice. This mimics the behavior of QTBUG-43344 where
|
|
||||||
- // QApplication first closes all windows and then QCocoaApplication flushes window system
|
|
||||||
- // events, triggering more close events.
|
|
||||||
- widget.windowHandle()->close();
|
|
||||||
- widget.windowHandle()->close();
|
|
||||||
- QCOMPARE(widget.closeCount, 1);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
QTEST_MAIN(tst_QWidget)
|
|
||||||
#include "tst_qwidget.moc"
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 4 14:37:31 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.14.0-rc:
|
||||||
|
* New bugfix release
|
||||||
|
* No changelog available
|
||||||
|
* For more details please see:
|
||||||
|
* For more details about Qt 5.14 please see:
|
||||||
|
https://wiki.qt.io/New_Features_in_Qt_5.14
|
||||||
|
- Drop patch, Qt behaviour changed now and applications can deal with
|
||||||
|
it meanwhile:
|
||||||
|
* 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 12 13:00:31 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
Tue Nov 12 13:00:31 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -36,16 +36,16 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: libqt5-qtbase
|
Name: libqt5-qtbase
|
||||||
Version: 5.14.0~beta3
|
Version: 5.14.0~rc
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: C++ Program Library, Core Components
|
Summary: C++ Program Library, Core Components
|
||||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Url: https://www.qt.io
|
Url: https://www.qt.io
|
||||||
%define base_name libqt5
|
%define base_name libqt5
|
||||||
%define real_version 5.14.0-beta3
|
%define real_version 5.14.0-rc
|
||||||
%define so_version 5.14.0
|
%define so_version 5.14.0
|
||||||
%define tar_version qtbase-everywhere-src-5.14.0-beta3
|
%define tar_version qtbase-everywhere-src-5.14.0-rc
|
||||||
Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
|
Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
|
||||||
# to get mtime of file:
|
# to get mtime of file:
|
||||||
Source1: libqt5-qtbase.changes
|
Source1: libqt5-qtbase.changes
|
||||||
@ -61,8 +61,6 @@ Patch10: libqt5-prioritise-gtk2-platformtheme.patch
|
|||||||
# PATCH-FEATURE-OPENSUSE 0001-Add-remote-print-queue-support.patch fate#322052 -- Automatically recognize and allow printing to remote cups servers
|
# PATCH-FEATURE-OPENSUSE 0001-Add-remote-print-queue-support.patch fate#322052 -- Automatically recognize and allow printing to remote cups servers
|
||||||
Patch12: 0001-Add-remote-print-queue-support.patch
|
Patch12: 0001-Add-remote-print-queue-support.patch
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch13: 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch
|
|
||||||
# PATCH-FIX-OPENSUSE
|
|
||||||
Patch21: 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
|
Patch21: 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
|
||||||
Patch22: 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch
|
Patch22: 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch
|
||||||
Patch23: 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
|
Patch23: 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:107f8937242f71a1b40c12a5f985a552a1e03359740df0458449b5c3d0a7fc61
|
|
||||||
size 49675132
|
|
3
qtbase-everywhere-src-5.14.0-rc.tar.xz
Normal file
3
qtbase-everywhere-src-5.14.0-rc.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e0e77bf99f15d5335e2613679928dd21b3399c1598f4010fda9e4191a046c56a
|
||||||
|
size 49706812
|
Loading…
Reference in New Issue
Block a user