diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-23 14:13:25 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-23 16:05:23 +0000 |
| commit | d19f782a887e4a8c87ceee42ad8405a0b12388d0 (patch) | |
| tree | c54ea1f4d6085f8ab7e84709d80ba4648a62fda4 /src/quicktemplates2/qquickdialogbuttonbox_p_p.h | |
| parent | 6272ba6ced2d6dc5fdd651fce9e958ac7215ccd0 (diff) | |
Fix enum warnings
QPlatformDialogHelper's meta-object is added to QQuickDialogButtonBox's
meta-object as a related meta object, and all of its enums are merged
into the same namespace by the QML engine. This produces a conflict with
the enum values of the ButtonLayout in QQuickDialogButtonBox, which is
a duplicate of the one that's already pulled in.
Fixes: QTBUG-70141
Task-number: QTBUG-70141
Change-Id: Ib33dc8ddbe8aa80d03183eb23861658c9e978f04
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h index 5d64918a..66386911 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h @@ -81,7 +81,7 @@ public: Qt::Alignment alignment = 0; QQuickDialogButtonBox::Position position = QQuickDialogButtonBox::Footer; QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; - QQuickDialogButtonBox::ButtonLayout buttonLayout = QQuickDialogButtonBox::UnknownLayout; + QPlatformDialogHelper::ButtonLayout buttonLayout = QPlatformDialogHelper::UnknownLayout; QQmlComponent *delegate = nullptr; }; |