diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-10 15:52:01 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-11 11:12:57 +0000 |
| commit | 086dc4316b1008453ac190bab414a1c46cde79ef (patch) | |
| tree | df469b5166244af0239451812a18b64f99c6443f /src/quicktemplates2/qquickdialogbuttonbox_p.h | |
| parent | 52990db1f07bdf8f236dcb9b2ac06480c39437f7 (diff) | |
Promote contentWidth and contentHeight to QQuickContainer
Now we have contentWidth and contentHeight promoted/unified to
QQuickPane and QQuickContainer, and all relevant types inherit the
properties from there. The next step is to promote read-only versions
all the way up to the QQuickControl base class.
Change-Id: Ic6ed5d7b7852b0c7faaa59b9a261c360bc63fb6a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialogbuttonbox_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox_p.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h index 0edc671d..e1a85f00 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h @@ -68,8 +68,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBox : public QQuickCont Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) // 2.5 (Qt 5.12) Q_PROPERTY(ButtonLayout buttonLayout READ buttonLayout WRITE setButtonLayout RESET resetButtonLayout NOTIFY buttonLayoutChanged FINAL REVISION 5) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 5) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 5) Q_FLAGS(QPlatformDialogHelper::StandardButtons) public: @@ -116,14 +114,6 @@ public: void setButtonLayout(ButtonLayout layout); void resetButtonLayout(); - qreal contentWidth() const; - void setContentWidth(qreal width); - void resetContentWidth(); - - qreal contentHeight() const; - void setContentHeight(qreal height); - void resetContentHeight(); - Q_SIGNALS: void accepted(); void rejected(); @@ -137,10 +127,6 @@ Q_SIGNALS: Q_REVISION(3) void applied(); Q_REVISION(3) void reset(); Q_REVISION(3) void discarded(); - // 2.5 (Qt 5.12) - Q_REVISION(5) void buttonLayoutChanged(); - Q_REVISION(5) void contentWidthChanged(); - Q_REVISION(5) void contentHeightChanged(); protected: void updatePolish() override; |