diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-09-03 16:54:16 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-09-03 17:17:45 +0200 |
| commit | b7f07e6d289a4235d4dc6000730226fb04045988 (patch) | |
| tree | 77490161dcc231da795965fc3170e2c1661736a4 | |
| parent | 45484e3f70cfb430e861754253f46fae1d745fda (diff) | |
| download | qtquickcontrols-b7f07e6d289a4235d4dc6000730226fb04045988.tar.gz | |
Dialogs: correct C++ warnings
Initialization order, and mistaken use of comparison instead of
assignment.
Change-Id: Ic9fbcac1085d84294386311f967209a6b33f2297
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 | ||||
| -rw-r--r-- | src/dialogs/qquickdialog_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index 060512d0..4f23dcb4 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); } diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h index 565859f3..fbf0ce0b 100644 --- a/src/dialogs/qquickdialog_p.h +++ b/src/dialogs/qquickdialog_p.h @@ -112,8 +112,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) |