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/qquickmenubar_p_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/qquickmenubar_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickmenubar_p_p.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 409c7123..e11580e2 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -85,12 +85,8 @@ public: void onItemTriggered(); void onMenuAboutToHide(); - qreal getContentWidth() const; - qreal getContentHeight() const; - - void updateContentWidth(); - void updateContentHeight(); - void updateContentSize(); + qreal getContentWidth() const override; + qreal getContentHeight() const override; void itemImplicitWidthChanged(QQuickItem *item) override; void itemImplicitHeightChanged(QQuickItem *item) override; @@ -104,10 +100,6 @@ public: bool popupMode; bool triggering; - bool hasContentWidth; - bool hasContentHeight; - qreal contentWidth; - qreal contentHeight; QQmlComponent *delegate; QPointer<QQuickMenuBarItem> currentItem; }; |