From 8a882a9e478481b0b86bf7a290d6e8621ef5664b Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 22 Dec 2022 11:11:35 +0200 Subject: Bump version to 5.15.13 Change-Id: I5ebe6019fbfd4b6ba60babd348ebd9b4055d5b76 Reviewed-by: Tarja Sundqvist --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 98a5e7259..37b4f91e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 -- cgit v1.2.3 From 225b9e40d7a1983f4129fb5b4e8e5285d78ce3d3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 17 Jun 2022 18:10:08 +0200 Subject: QQuickAbstractDialog: treat closing as rejection QDialog treats the closing of the dialog via the [X] button as rejection. QQuickAbstractDialog just recorded the change in its m_visible member, but failed to emit rejected(), which caused users of the dialog to wait indefinitely for a result. Fix by emitting rejected() when the user closes the dialog via [X]. Fixes: QTBUG-101973 Change-Id: I5a66a69aec33f6a05279f20880e70cf633102a8d Reviewed-by: Mitch Curtis Reviewed-by: Shawn Rutledge Reviewed-by: Axel Spoerl --- src/dialogs/qquickabstractdialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index 9c2e08625..3d2db3861 100644 --- a/src/dialogs/qquickabstractdialog.cpp +++ b/src/dialogs/qquickabstractdialog.cpp @@ -267,6 +267,8 @@ void QQuickAbstractDialog::reject() void QQuickAbstractDialog::visibleChanged(bool v) { + if (m_visible && !v) // closed by user + emit rejected(); // treat as rejected m_visible = v; qCDebug(lcWindow) << "visible" << v; emit visibilityChanged(); -- cgit v1.2.3