From d19f782a887e4a8c87ceee42ad8405a0b12388d0 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 23 Aug 2018 14:13:25 +0200 Subject: 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 --- src/quicktemplates2/qquickdialogbuttonbox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quicktemplates2/qquickdialogbuttonbox.cpp') 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(); + return QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogButtonBoxLayout).value(); } 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) -- cgit v1.2.3