QQuickPage: prepare for inheritance

Add a header for the private class, and a protected constructor.

Change-Id: Id34b32dd614a430ec7e299c53341f21c4fba36d9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 85 insertions, 18 deletions

diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 0a7a3476..31a3914f 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qquickpage_p.h"
-#include "qquickpane_p_p.h"
+#include "qquickpage_p_p.h"
 #include "qquicktabbar_p.h"
 #include "qquicktoolbar_p.h"
 #include "qquickdialogbuttonbox_p.h"
@@ -115,23 +115,6 @@ namespace {
     }
 }
 
-class QQuickPagePrivate : public QQuickPanePrivate
-{
-    Q_DECLARE_PUBLIC(QQuickPage)
-
-public:
-    void relayout();
-    void resizeContent() override;
-
-    void itemVisibilityChanged(QQuickItem *item) override;
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF & diff) override;
-    void itemDestroyed(QQuickItem *item) override;
-
-    QString title;
-    QQuickItem *header = nullptr;
-    QQuickItem *footer = nullptr;
-};
-
 void QQuickPagePrivate::relayout()
 {
     Q_Q(QQuickPage);
@@ -195,6 +178,11 @@ QQuickPage::QQuickPage(QQuickItem *parent)
 {
 }
 
+QQuickPage::QQuickPage(QQuickPagePrivate &dd, QQuickItem *parent)
+    : QQuickPane(dd, parent)
+{
+}
+
 QQuickPage::~QQuickPage()
 {
     Q_D(QQuickPage);
diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h
index f6bbaa0c..a39ac8e2 100644
--- a/src/quicktemplates2/qquickpage_p.h
+++ b/src/quicktemplates2/qquickpage_p.h
@@ -84,6 +84,8 @@ Q_SIGNALS:
     void footerChanged();
 
 protected:
+    QQuickPage(QQuickPagePrivate &dd, QQuickItem *parent);
+
     void componentComplete() override;
 
     void spacingChange(qreal newSpacing, qreal oldSpacing) override;
diff --git a/src/quicktemplates2/qquickpage_p_p.h b/src/quicktemplates2/qquickpage_p_p.h
new file mode 100644
index 00000000..42ffcfb2
--- /dev/null
+++ b/src/quicktemplates2/qquickpage_p_p.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKPAGE_P_P_H
+#define QQUICKPAGE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQuickTemplates2/private/qquickpane_p_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickPane;
+
+class QQuickPagePrivate : public QQuickPanePrivate
+{
+    Q_DECLARE_PUBLIC(QQuickPage)
+
+public:
+    void relayout();
+    void resizeContent() override;
+
+    void itemVisibilityChanged(QQuickItem *item) override;
+    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF & diff) override;
+    void itemDestroyed(QQuickItem *item) override;
+
+    QString title;
+    QQuickItem *header = nullptr;
+    QQuickItem *footer = nullptr;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKPAGE_P_P_H
diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri
index 8d90ab37..3a402d4b 100644
--- a/src/quicktemplates2/quicktemplates2.pri
+++ b/src/quicktemplates2/quicktemplates2.pri
@@ -48,6 +48,7 @@ HEADERS += \
     $$PWD/qquickoverlay_p.h \
     $$PWD/qquickoverlay_p_p.h \
     $$PWD/qquickpage_p.h \
+    $$PWD/qquickpage_p_p.h \
     $$PWD/qquickpageindicator_p.h \
     $$PWD/qquickpagelayout_p_p.h \
     $$PWD/qquickpalette_p.h \