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/qquickpagelayout.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/qquickpagelayout.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpagelayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpagelayout.cpp b/src/quicktemplates2/qquickpagelayout.cpp index 16354c5a..a1747b47 100644 --- a/src/quicktemplates2/qquickpagelayout.cpp +++ b/src/quicktemplates2/qquickpagelayout.cpp @@ -140,8 +140,8 @@ void QQuickPageLayout::update() { QQuickItem *content = m_control->contentItem(); - const qreal hh = m_header ? m_header->height() : 0; - const qreal fh = m_footer ? m_footer->height() : 0; + const qreal hh = m_header && m_header->isVisible() ? m_header->height() : 0; + const qreal fh = m_footer && m_footer->isVisible() ? m_footer->height() : 0; content->setY(hh + m_control->topPadding()); content->setX(m_control->leftPadding()); |