diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-17 12:53:02 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 10:35:58 +0000 |
| commit | 1fd8a2fc11926dc405d71aafbbfc274c82a574de (patch) | |
| tree | 168567d161985f3d32b4906ad137348ace0333f3 /src/quicktemplates2/qquickpage_p.h | |
| parent | d2496a68bbed9ed7e66faefef1e03e5352cc4100 (diff) | |
Merge QQuickPageLayout to QQuickPage
The idea of a separate QQuickPageLayout falls a bit short, because as
a non-QObject it cannot e.g. emit signals when the headers and footers
change as a result of being destroyed. Next, we want to add implicit
header and footer sizes, which has the same problem. QQuickPageLayout
is currently used by QQuickPage and QQuickDialog. We are now moving the
functionality to QQuickPage, and will use QQuickPage in QQuickDialog
instead.
Change-Id: I869e6ba0056d424e617c48c2e4f591c75cde48e5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpage_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpage_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index 49f9f85f..f6bbaa0c 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickPane public: explicit QQuickPage(QQuickItem *parent = nullptr); + ~QQuickPage(); QString title() const; void setTitle(const QString &title); @@ -85,8 +86,6 @@ Q_SIGNALS: protected: void componentComplete() override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void spacingChange(qreal newSpacing, qreal oldSpacing) override; #if QT_CONFIG(accessibility) |