5 files changed, 0 insertions, 62 deletions

diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml
index 027acca8..cd5f0dbd 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/imports/controls/material/DialogButtonBox.qml
@@ -46,7 +46,6 @@ T.DialogButtonBox {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
-    flat: true
     spacing: 8
     padding: 8
     topPadding: padding - 4
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index bc05bd7a..2f2ab479 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -142,7 +142,6 @@ static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button
 }
 
 QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() :
-    flat(false),
     alignment(0),
     position(QQuickDialogButtonBox::Footer),
     standardButtons(QPlatformDialogHelper::NoButton),
@@ -358,36 +357,6 @@ QQuickDialogButtonBox::~QQuickDialogButtonBox()
 {
 }
 
-/*!
-    \qmlproperty bool QtQuick.Controls::DialogButtonBox::flat
-
-    This property holds whether the buttons in the button box are flat.
-
-    The default value is \c false.
-
-    \sa Button::flat
-*/
-bool QQuickDialogButtonBox::isFlat() const
-{
-    Q_D(const QQuickDialogButtonBox);
-    return d->flat;
-}
-
-void QQuickDialogButtonBox::setFlat(bool flat)
-{
-    Q_D(QQuickDialogButtonBox);
-    if (flat == d->flat)
-        return;
-
-    for (int i = 0; i < count(); ++i) {
-        QQuickButton *button = qobject_cast<QQuickButton *>(itemAt(i));
-        if (button)
-            button->setFlat(flat);
-    }
-
-    d->flat = flat;
-    emit flatChanged();
-}
 
 /*!
     \qmlproperty enumeration QtQuick.Controls::DialogButtonBox::position
@@ -604,8 +573,6 @@ void QQuickDialogButtonBox::itemAdded(int index, QQuickItem *item)
     Q_UNUSED(index);
     if (QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(item))
         QObjectPrivate::connect(button, &QQuickAbstractButton::clicked, d, &QQuickDialogButtonBoxPrivate::handleClick);
-    if (QQuickButton *button = qobject_cast<QQuickButton *>(item))
-        button->setFlat(d->flat);
     if (QQuickDialogButtonBoxAttached *attached = qobject_cast<QQuickDialogButtonBoxAttached *>(qmlAttachedPropertiesObject<QQuickDialogButtonBox>(item, false)))
         QQuickDialogButtonBoxAttachedPrivate::get(attached)->setButtonBox(this);
     if (isComponentComplete())
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h
index 633cf577..445b645b 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h
@@ -62,7 +62,6 @@ class QQuickDialogButtonBoxAttachedPrivate;
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBox : public QQuickContainer
 {
     Q_OBJECT
-    Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL)
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
     Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment RESET resetAlignment NOTIFY alignmentChanged FINAL)
     Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL)
@@ -73,9 +72,6 @@ public:
     explicit QQuickDialogButtonBox(QQuickItem *parent = nullptr);
     ~QQuickDialogButtonBox();
 
-    bool isFlat() const;
-    void setFlat(bool flat);
-
     enum Position {
         Header,
         Footer
@@ -104,7 +100,6 @@ Q_SIGNALS:
     void helpRequested();
     void clicked(QQuickAbstractButton *button);
 
-    void flatChanged();
     void positionChanged();
     void alignmentChanged();
     void standardButtonsChanged();
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
index b40fb75a..d25bd90a 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
@@ -75,7 +75,6 @@ public:
     QQuickAbstractButton *createStandardButton(QPlatformDialogHelper::StandardButton button);
     void removeStandardButtons();
 
-    bool flat;
     Qt::Alignment alignment;
     QQuickDialogButtonBox::Position position;
     QPlatformDialogHelper::StandardButtons standardButtons;
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index 296a4e0e..8474e89b 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -141,28 +141,6 @@ TestCase {
         control.destroy()
     }
 
-    function test_flat() {
-        var control = buttonBox.createObject(testCase)
-
-        control.flat = true
-        compare(control.flat, true)
-
-        control.standardButtons = DialogButtonBox.Ok | DialogButtonBox.Cancel | DialogButtonBox.Apply
-        button.createObject(control, {text: "Custom"})
-        compare(control.count, 4)
-
-        for (var i = 0; i < control.count; ++i)
-            compare(control.itemAt(i).flat, true)
-
-        control.flat = false
-        compare(control.flat, false)
-
-        for (var j = 0; j < control.count; ++j)
-            compare(control.itemAt(j).flat, false)
-
-        control.destroy()
-    }
-
     function test_signals_data() {
         return [
             { tag: "Ok", standardButton: DialogButtonBox.Ok, buttonRole: DialogButtonBox.AcceptRole, signalName: "accepted" },