diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-17 14:34:51 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-18 11:08:28 +0000 |
| commit | 26bfe7cb1a5f068b5287174f113335c8731dac82 (patch) | |
| tree | f12186d8ec7d02c0c64e968262c4dd3319ac07c8 /tests/auto/controls/data/tst_dialog.qml | |
| parent | 6bd301a56a4f7d010383ebcb04f7ef398b3be3ae (diff) | |
Incorporate QQuickDialog::result from QQuickPlatformDialog
The experimental QQuickPlatformDialog in Qt.labs.platform had a bit
more elaborate accepted vs. rejected dialog result handling. Copy the
same logic to QQuickDialog in QtQuick.Controls.
[ChangeLog][Controls][Dialog] Added "result" property that holds
whether the dialog was previously accepted or rejected.
Change-Id: I2c55848b5eeaad2130d32a337c2590212736f22c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/controls/data/tst_dialog.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_dialog.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index 2f3d2a6b..4d75b910 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -99,6 +99,7 @@ TestCase { verify(acceptedSpy.valid) control.accept() compare(acceptedSpy.count, 1) + compare(control.result, Dialog.Accepted) tryCompare(control, "visible", false) } @@ -118,6 +119,7 @@ TestCase { verify(rejectedSpy.valid) control.reject() compare(rejectedSpy.count, 1) + compare(control.result, Dialog.Rejected) tryCompare(control, "visible", false) |