aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitemview.cpp
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2018-05-15 15:58:12 +1000
committerLorn Potter <lorn.potter@gmail.com>2018-05-15 18:41:53 +0000
commit5f4698c4e7952d64e78e3a06de5ac28d68415b19 (patch)
tree7ee371873e4206b13f1eaf60d48bb3ae9a10f8ca /src/quick/items/qquickitemview.cpp
parent7e22af4bfdfd736e624321924eaae0e0d36940c7 (diff)
wasm: revert DirectConnection changes
Requires the wasm qthread changes in qtbase Change-Id: Ib55b683e0f752031a596ecdafcef22b7c8b9d494 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
-rw-r--r--src/quick/items/qquickitemview.cpp14
1 files changed, 3 insertions, 11 deletions
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();