Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2018-07-01 21:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Sun Jul 1 21:24:30 2018 rev:84 rq:619726 version:5.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2018-06-26 10:30:09.126824329 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2018-07-01 21:24:33.132912468 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 07:21:37 UTC 2018 - fab...@ritter-vogt.de + +- Revert upstream commit to avoid regressions (kde#395988): + * 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch + +------------------------------------------------------------------- New: ---- 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.9dvZ9j/_old 2018-07-01 21:24:34.020911312 +0200 +++ /var/tmp/diff_new_pack.9dvZ9j/_new 2018-07-01 21:24:34.024911307 +0200 @@ -63,6 +63,8 @@ # 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 # PATCH-FIX-OPENSUSE +Patch13: 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch +# PATCH-FIX-OPENSUSE Patch16: 0001-Hack-together-a-way-to-get-fallback-from-xcb-working.patch # PATCH-FIX-UPSTREAM Patch17: qapplication-emit-palettechanged.patch ++++++ 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch ++++++ >From fa9728f19c8bf8ae925a1c99d056559b7bc84515 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@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