diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-16 12:35:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-16 12:38:06 +0200 |
| commit | 1aecda36d1d12bcd24a5ee87dd82ed04f85c41e2 (patch) | |
| tree | af84a7911c2d6a2c1d54582810cb95665ae534f1 /src/dialogs/qquickdialog.cpp | |
| parent | 6a7a824b970d12471f9219c84a57eb91231c59fe (diff) | |
| parent | d70e5ebe11a8eb22fe5e71945982d81991dc9f09 (diff) | |
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Change-Id: I91d1886e6081e39a1b5ea17b6c44d73b539889b1
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index 060512d01..4f23dcb47 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -238,7 +238,7 @@ QJSValue QQuickDialog::__standardButtonsRightModel() void QQuickDialog::setVisible(bool v) { if (v) - m_clickedButton == NoButton; + m_clickedButton = NoButton; QQuickAbstractDialog::setVisible(v); } |