forked from pool/libqt5-qtbase
e25a4c083c
- Add patch to restore compatibility with akonadi's PGSQL backend (see https://bugs.archlinux.org/task/62997): * 0001-Revert-Always-escape-the-table-names-when-creating-t.patch - Disable libzstd support again, it breaks various existing codebases (QTBUG-76521) - Update to 5.13.0: * New bugfix release * No changelog available * For more details about Qt 5.13 please see: * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.0/?h=5.13 - Remove patches, now upstream: * 0001-Add-quoting-to-deal-with-empty-CMAKE_CXX_STANDARD_LI.patch - Add patches to improve compatibility with Krita: * 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch * 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch * 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch - Revert yet another commit to fix linker errors: * 0001-Revert-qmake-link-qt-libraries-by-full-path.patch - Enable libzstd support - Revert some commits in the hope of fixing some broken paths (QTBUG-76255): * 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch * 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch * 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch - Add patch to fix some cmake module config files (QTBUG-76244): OBS-URL: https://build.opensuse.org/request/show/712125 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=97
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From a69373ff735e1ae3e14b5a05a08e4aebf9216185 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Kazakov <dimula73@gmail.com>
|
|
Date: Thu, 6 Dec 2018 16:16:27 +0300
|
|
Subject: [PATCH 1/3] 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".
|
|
|
|
Change-Id: Id3ffbd2018a8e68844d174328dd1c4ceb7fa01d3
|
|
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|
---
|
|
src/widgets/widgets/qdockwidget.cpp | 2 ++
|
|
tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 6 +++++-
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
|
|
index 4041c730b8..f98e0e44db 100644
|
|
--- a/src/widgets/widgets/qdockwidget.cpp
|
|
+++ b/src/widgets/widgets/qdockwidget.cpp
|
|
@@ -1182,6 +1182,8 @@ void QDockWidgetPrivate::setWindowState(bool floating, bool unplug, const QRect
|
|
QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q);
|
|
if (mwlayout)
|
|
emit q->dockLocationChanged(mwlayout->dockWidgetArea(q));
|
|
+ } else {
|
|
+ emit q->dockLocationChanged(Qt::NoDockWidgetArea);
|
|
}
|
|
}
|
|
|
|
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
|
|
index f8ce6a2c0a..625116654d 100644
|
|
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
|
|
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
|
|
@@ -670,7 +670,11 @@ void tst_QDockWidget::dockLocationChanged()
|
|
spy.clear();
|
|
|
|
dw.setFloating(true);
|
|
- QTest::qWait(100);
|
|
+ QTRY_COMPARE(spy.count(), 1);
|
|
+ QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
|
|
+ Qt::NoDockWidgetArea);
|
|
+ spy.clear();
|
|
+
|
|
dw.setFloating(false);
|
|
QTRY_COMPARE(spy.count(), 1);
|
|
QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
|
|
--
|
|
2.21.0
|
|
|