diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-14 01:02:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-16 09:38:30 +0200 |
| commit | 43645fd59c6bcb0a3e37eef530ef970f51ed48af (patch) | |
| tree | d377a19c36e9e853377db59b58d937db0ea67e0d /src/imports | |
| parent | ad0f200df54e5afcb1fdcb977794259bdb9216b5 (diff) | |
| parent | f42207cbdb0cbe5e345bfd9e000b3e77b34a503c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quick/items/qquickloader.cpp
tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Change-Id: I0cb9f637d24ccd0ecfb50c455cc210119f744b02
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/layouts/qquicklayout.cpp | 3 | ||||
| -rw-r--r-- | src/imports/window/plugins.qmltypes | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp index b3a5a2cfc8..cc206bcb95 100644 --- a/src/imports/layouts/qquicklayout.cpp +++ b/src/imports/layouts/qquicklayout.cpp @@ -764,6 +764,9 @@ bool QQuickLayout::shouldIgnoreItem(QQuickItem *child, QQuickLayoutAttached *&in ignoreItem = effectiveMaxSize.isNull(); } + if (!ignoreItem && childPrivate->isTransparentForPositioner()) + ignoreItem = true; + if (ignoreItem) d->m_ignoredItems << child; return ignoreItem; diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 4ae23a093e..4815be7262 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Window 2.10' +// 'qmlplugindump -nonrelocatable QtQuick.Window 2.11' Module { dependencies: ["QtQuick 2.8"] |