diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:04 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:04 +0200 |
| commit | 77fbfa8d313bbdb8fb762f15dd6173a067be55e3 (patch) | |
| tree | 19d7ef03cd9c98dd0531e8cd0d66871455e773c6 | |
| parent | 1ca962198a703f591efc7c8f7540fc4120746a00 (diff) | |
| parent | 225b9e40d7a1983f4129fb5b4e8e5285d78ce3d3 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I8cb1dcc40a17262d6a40ab2d469a6989d4f123de
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractdialog.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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 diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index e71948d18..81819d064 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(); |