diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 14:08:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 14:08:24 +0200 |
| commit | 6a6eaec0e8c2d4cd1ffbe2fe154a3a3caad54dc9 (patch) | |
| tree | 5d8352f302bc979332eed01e250554b69961311e /src/quicktemplates2/qquickpage.cpp | |
| parent | c02d23360186b43fcd570e1c7fc666cb14b487d6 (diff) | |
| parent | b172b30368bafc839b92f767324496a509267fc7 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickpage.cpp
Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
Diffstat (limited to 'src/quicktemplates2/qquickpage.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpage.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 67b1f063..4304c4fb 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -91,7 +91,6 @@ public: QScopedPointer<QQuickPageLayout> layout; }; - QQuickPage::QQuickPage(QQuickItem *parent) : QQuickControl(*(new QQuickPagePrivate), parent) { |