diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-18 11:30:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-18 11:30:23 +0200 |
| commit | 0276bda8914f94081d844ed671a215906fd1ae70 (patch) | |
| tree | 2b54bb9c120cf5cd257337e3e005f12a6124f9c3 /src/dialogs/qquickdialog_p.h | |
| parent | 2766db3c581f00dbadabaef8eb869d404d821fe9 (diff) | |
| parent | 1aecda36d1d12bcd24a5ee87dd82ed04f85c41e2 (diff) | |
| download | qtquickcontrols-0276bda8914f94081d844ed671a215906fd1ae70.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/controls/qquickmenupopupwindow.cpp
Change-Id: Ibc10e7da3b3a2983c022b8973cd80cb1a7e110af
Diffstat (limited to 'src/dialogs/qquickdialog_p.h')
| -rw-r--r-- | src/dialogs/qquickdialog_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h index 087f677d..3ae055f7 100644 --- a/src/dialogs/qquickdialog_p.h +++ b/src/dialogs/qquickdialog_p.h @@ -104,8 +104,8 @@ private: private: QString m_title; - StandardButton m_clickedButton; StandardButtons m_enabledButtons; + StandardButton m_clickedButton; QJSValue m_standardButtonsLeftModel; QJSValue m_standardButtonsRightModel; Q_DISABLE_COPY(QQuickDialog) |