aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickdialog_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-17 14:34:51 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-05-18 11:08:28 +0000
commit26bfe7cb1a5f068b5287174f113335c8731dac82 (patch)
treef12186d8ec7d02c0c64e968262c4dd3319ac07c8 /src/quicktemplates2/qquickdialog_p_p.h
parent6bd301a56a4f7d010383ebcb04f7ef398b3be3ae (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 'src/quicktemplates2/qquickdialog_p_p.h')
-rw-r--r--src/quicktemplates2/qquickdialog_p_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates2/qquickdialog_p_p.h
index 13885ca9..2a0f4b53 100644
--- a/src/quicktemplates2/qquickdialog_p_p.h
+++ b/src/quicktemplates2/qquickdialog_p_p.h
@@ -60,13 +60,14 @@ class QQuickDialogPrivate : public QQuickPopupPrivate
Q_DECLARE_PUBLIC(QQuickDialog)
public:
- QQuickDialogPrivate() : buttonBox(nullptr) { }
+ QQuickDialogPrivate() : result(0), buttonBox(nullptr) { }
static QQuickDialogPrivate *get(QQuickDialog *dialog)
{
return dialog->d_func();
}
+ int result;
QString title;
QQuickDialogButtonBox *buttonBox;
QScopedPointer<QQuickPageLayout> layout;