From 7e22af4bfdfd736e624321924eaae0e0d36940c7 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 8 May 2018 10:41:46 +1000 Subject: webassembly: fix for crash and assert on no thread and wasm builds This change requires moveToThread change in qtbase Change-Id: Idf35af4b416f577dabb91f749929dbfe5c88a0f0 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/imports/layouts/qquicklayout.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/imports') diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp index b3a5a2cfc8..d2bf0bbe8f 100644 --- a/src/imports/layouts/qquicklayout.cpp +++ b/src/imports/layouts/qquicklayout.cpp @@ -781,7 +781,12 @@ void QQuickLayout::itemChange(ItemChange change, const ItemChangeData &value) if (change == ItemChildAddedChange) { Q_D(QQuickLayout); QQuickItem *item = value.item; +#ifndef QT_NO_THREAD qmlobject_connect(item, QQuickItem, SIGNAL(baselineOffsetChanged(qreal)), this, QQuickLayout, SLOT(invalidateSenderItem())); +#else + // DirectConnection seems too quick for wasm here + QObject::connect(item, SIGNAL(baselineOffsetChanged(qreal)), this, SLOT(invalidateSenderItem())); +#endif QQuickItemPrivate::get(item)->addItemChangeListener(this, changeTypes); d->m_hasItemChangeListeners = true; if (isReady()) -- cgit v1.2.3