diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-22 20:46:33 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 09:17:17 +0000 |
| commit | fa71ef5a2ccfa4666db9338c4ba8f34d19f2faf1 (patch) | |
| tree | 69f0e465ea5f5baf38a22631fe8d178fde8a795b /src/quicktemplates2/qquickdialog_p.h | |
| parent | 791d521a3008695f834d5aa8c9bb61f9075b37a8 (diff) | |
QQuickDialog: simplify the button box handling
Just fill in the footer with a button box by default from the styles.
This makes the next step easier, to provide also a default title bar
in the header.
Task-number: QTBUG-56711
Change-Id: I621a61f29f9ba2fe4b7e907d81da5988133a98c8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialog_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickdialog_p.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index 2c7eee95..1cd50f4a 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE -class QQmlComponent; class QQuickDialogPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup @@ -61,7 +60,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup Q_OBJECT Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) - Q_PROPERTY(QQmlComponent *buttonBox READ buttonBox WRITE setButtonBox NOTIFY buttonBoxChanged FINAL) Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL) Q_FLAGS(QPlatformDialogHelper::StandardButtons) @@ -74,9 +72,6 @@ public: QQuickItem *footer() const; void setFooter(QQuickItem *footer); - QQmlComponent *buttonBox() const; - void setButtonBox(QQmlComponent *box); - QPlatformDialogHelper::StandardButtons standardButtons() const; void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons); @@ -90,11 +85,9 @@ Q_SIGNALS: void headerChanged(); void footerChanged(); - void buttonBoxChanged(); void standardButtonsChanged(); protected: - void componentComplete() override; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; |