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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 31b2e646..03f5f8e8 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -192,9 +192,9 @@ QT_BEGIN_NAMESPACE \sa accepted(), rejected(), helpRequested() */ -static QQuickDialogButtonBox::ButtonLayout platformButtonLayout() +static QPlatformDialogHelper::ButtonLayout platformButtonLayout() { - return QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).value<QQuickDialogButtonBox::ButtonLayout>(); + return QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).value<QPlatformDialogHelper::ButtonLayout>(); } void QQuickDialogButtonBoxPrivate::itemImplicitWidthChanged(QQuickItem *item) @@ -653,13 +653,13 @@ QQuickDialogButtonBoxAttached *QQuickDialogButtonBox::qmlAttachedProperties(QObj \value DialogButtonBox.GnomeLayout Use a policy appropriate for applications on GNOME. \value DialogButtonBox.AndroidLayout Use a policy appropriate for applications on Android. */ -QQuickDialogButtonBox::ButtonLayout QQuickDialogButtonBox::buttonLayout() const +QPlatformDialogHelper::ButtonLayout QQuickDialogButtonBox::buttonLayout() const { Q_D(const QQuickDialogButtonBox); return d->buttonLayout; } -void QQuickDialogButtonBox::setButtonLayout(ButtonLayout layout) +void QQuickDialogButtonBox::setButtonLayout(QPlatformDialogHelper::ButtonLayout layout) { Q_D(QQuickDialogButtonBox); if (d->buttonLayout == layout) |