diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:44 +0100 |
| commit | bbea1b8a3a7742e8abf3e3c1c4a08828ec0f663a (patch) | |
| tree | 75cf85396de2ad99deeeb457202bf0fb0e14409b /src/imports | |
| parent | 1ee5fed75f07ac63fe6f0463fca72af672304ddb (diff) | |
| parent | 6597d990147d21d55449302cb3201e4769e15a2a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I88e94fe3398a59f10c5a8b142204db5f3ccb2657
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/imports.pro | 5 | ||||
| -rw-r--r-- | src/imports/layouts/qquicklayout_p.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 9973883024..e0f66838ec 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -20,8 +20,9 @@ qtHaveModule(quick) { labsanimation \ layouts \ qtquick2 \ - window \ - wavefrontmesh + window + + qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh qtHaveModule(testlib): SUBDIRS += testlib qtConfig(systemsemaphore): SUBDIRS += sharedimage diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h index c022a2fd47..cb46c41e6c 100644 --- a/src/imports/layouts/qquicklayout_p.h +++ b/src/imports/layouts/qquicklayout_p.h @@ -135,7 +135,7 @@ class QQuickLayoutPrivate : public QQuickItemPrivate { Q_DECLARE_PUBLIC(QQuickLayout) public: - QQuickLayoutPrivate() : m_isReady(false), m_disableRearrange(true) {} + QQuickLayoutPrivate() : m_isReady(false), m_disableRearrange(true), m_hasItemChangeListeners(false) {} protected: unsigned m_isReady : 1; |