From 5f4698c4e7952d64e78e3a06de5ac28d68415b19 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 15 May 2018 15:58:12 +1000 Subject: wasm: revert DirectConnection changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Requires the wasm qthread changes in qtbase Change-Id: Ib55b683e0f752031a596ecdafcef22b7c8b9d494 Reviewed-by: Morten Johan Sørvig --- src/quick/items/qquickitemview.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/quick/items/qquickitemview.cpp') diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index bc8163d53c..a02358e275 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -331,17 +331,9 @@ void QQuickItemView::setModel(const QVariant &m) if (d->model) { d->bufferMode = QQuickItemViewPrivate::BufferBefore | QQuickItemViewPrivate::BufferAfter; - - Qt::ConnectionType type = Qt::AutoConnection; -#ifdef QT_NO_THREAD - // This is needed because the thread affinity of the receiving object - // will be different from the executing thread, when threads are not - // supported - type = Qt::DirectConnection; -#endif - QObject::connect(d->model, SIGNAL(createdItem(int,QObject*)), this, SLOT(createdItem(int,QObject*)), type); - QObject::connect(d->model, SIGNAL(initItem(int,QObject*)), this, SLOT(initItem(int,QObject*)), type); - QObject::connect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*)), type); + connect(d->model, SIGNAL(createdItem(int,QObject*)), this, SLOT(createdItem(int,QObject*))); + connect(d->model, SIGNAL(initItem(int,QObject*)), this, SLOT(initItem(int,QObject*))); + connect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*))); if (isComponentComplete()) { d->updateSectionCriteria(); -- cgit v1.2.3