aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickdialogbuttonbox_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-06-29 19:53:36 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-06-30 14:54:23 +0000
commita5df6b69672afd780433ee8f43d343d1e2251fd4 (patch)
treed6d586ce0c4ea3d24f38ad5127158b9d1e068251 /src/quicktemplates2/qquickdialogbuttonbox_p.h
parent8ed484329fc277366d7bbcd63832b0effbbbbf9f (diff)
Remove DialogButtonBox::flat
The Material Design allows mixing standard flat buttons with non-flat custom buttons. It is enough that the delegate provides flat standard buttons by default. It is better to not force all buttons to be flat, but let the user freely specify whether custom buttons are flat. This API has not yet been released, so it is still safe to remove. Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox_p.h')
-rw-r--r--src/quicktemplates2/qquickdialogbuttonbox_p.h5
1 files changed, 0 insertions, 5 deletions
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();