diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-18 16:15:01 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 15:34:40 +0100 |
| commit | f1f395b37da163bce2dc3b5fc4e298bb4f56a3e7 (patch) | |
| tree | 9ce2ba89a86ed754a8ecb8f52181770853e21a08 /src/qml/qml/qqmlengine.cpp | |
| parent | ba494aaa24defe1401f621b791891e696b308756 (diff) | |
| parent | 0ee087f5a5edd7d1aa39fd15e0dc85985320c09a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 1a868bfaa1..bde4df1340 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -784,9 +784,9 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in // marshalled back onto the QObject's thread and handled by QML from there. This is tested // by the qqmlecmascript::threadSignal() autotest. if (ddata->notifyList && - QThread::currentThreadId() != QObjectPrivate::get(object)->threadData->threadId.loadRelaxed()) { + QThread::currentThreadId() != QObjectPrivate::get(object)->getThreadData()->threadId.loadRelaxed()) { - if (!QObjectPrivate::get(object)->threadData->thread.loadAcquire()) + if (!QObjectPrivate::get(object)->getThreadData()->thread.loadAcquire()) return; QMetaMethod m = QMetaObjectPrivate::signal(object->metaObject(), index); @@ -818,7 +818,7 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in QQmlThreadNotifierProxyObject *mpo = new QQmlThreadNotifierProxyObject; mpo->target = object; - mpo->moveToThread(QObjectPrivate::get(object)->threadData->thread.loadAcquire()); + mpo->moveToThread(QObjectPrivate::get(object)->getThreadData()->thread.loadAcquire()); QCoreApplication::postEvent(mpo, ev.take()); } else { @@ -2233,7 +2233,7 @@ void QQmlEngine::setPluginPathList(const QStringList &paths) On failure and if non-null, the \a errors list will have any errors which occurred prepended to it. - The plugin has to be a Qt plugin which implements the QQmlExtensionPlugin interface. + The plugin has to be a Qt plugin which implements the QQmlEngineExtensionPlugin interface. */ bool QQmlEngine::importPlugin(const QString &filePath, const QString &uri, QList<QQmlError> *errors) { |