From 5a165c60b9b8c4847067cb83b4be7da785d01f93 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Sep 2019 08:17:07 +0100 Subject: gentoo resync : 28.09.2019 --- ...ts-5.12.4-fix-notification-of-QDockWidget.patch | 37 ------------------- .../qtwidgets-5.12.4-revert-reset-winId.patch | 41 ---------------------- 2 files changed, 78 deletions(-) delete mode 100644 dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch delete mode 100644 dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch (limited to 'dev-qt/qtwidgets/files') diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch deleted file mode 100644 index 5f72fef9d34c..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: fix notification of QDockWidget when it gets undocked - Before the patch the notification was emitted only when the docker - was attached to the panel or changed a position on it. - . - It looks like the old behavior was documented in a unittest, - so this patch might actually be a "behavior change". - . - Note: https://mail.kde.org/pipermail/distributions/2019-April/000317.html -Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=06b8644953fc5267 -Last-Update: 2019-06-14 - ---- a/src/widgets/widgets/qdockwidget.cpp -+++ b/src/widgets/widgets/qdockwidget.cpp -@@ -1171,6 +1171,8 @@ void QDockWidgetPrivate::setWindowState( - QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q); - if (mwlayout) - emit q->dockLocationChanged(mwlayout->dockWidgetArea(q)); -+ } else { -+ emit q->dockLocationChanged(Qt::NoDockWidgetArea); - } - } - ---- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp -+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp -@@ -669,7 +669,11 @@ void tst_QDockWidget::dockLocationChange - spy.clear(); - - dw.setFloating(true); -- QTest::qWait(100); -+ QTRY_COMPARE(spy.count(), 1); -+ QCOMPARE(qvariant_cast(spy.at(0).at(0)), -+ Qt::NoDockWidgetArea); -+ spy.clear(); -+ - dw.setFloating(false); - QTRY_COMPARE(spy.count(), 1); - QCOMPARE(qvariant_cast(spy.at(0).at(0)), diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch deleted file mode 100644 index 777d0195a53f..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch +++ /dev/null @@ -1,41 +0,0 @@ -From deac052a40c93633041da058d5c73c9e91aa76c7 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= -Date: Fri, 12 Jul 2019 12:28:29 +0200 -Subject: [PATCH] Revert "Reset QWidget's winId when backing window surface is - destroyed" - -This reverts commit a9246c7132a2c8864d3ae6cebd260bb9ee711fcb. - -The QWidget machinery is way to fragile to reset the winId under the -feet of QWidget like that. We would potentially need to include all -the logic in QWidget::destroy. This also ties into the flow between -QtGui and QtWidgets during window closing, which is still unresolved. - -Change-Id: I168048a63c89796398eb5331a80ce3e5c8d9a208 -Fixes: QTBUG-76588 -Task-number: QTBUG-69289 -Reviewed-by: Friedemann Kleint -Reviewed-by: Volker Hilsheimer ---- - src/widgets/kernel/qwidget.cpp | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp -index fdb38729032..6f0f39a3443 100644 ---- a/src/widgets/kernel/qwidget.cpp -+++ b/src/widgets/kernel/qwidget.cpp -@@ -9382,12 +9382,6 @@ bool QWidget::event(QEvent *event) - d->renderToTextureReallyDirty = 1; - #endif - break; -- case QEvent::PlatformSurface: { -- auto surfaceEvent = static_cast(event); -- if (surfaceEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed) -- d->setWinId(0); -- break; -- } - #ifndef QT_NO_PROPERTIES - case QEvent::DynamicPropertyChange: { - const QByteArray &propName = static_cast(event)->propertyName(); --- -2.16.3 -- cgit v1.2.3