diff options
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 21 | ||||
| -rw-r--r-- | src/qml/util/qqmlchangeset.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickview.cpp | 4 |
4 files changed, 23 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index c21d992e98..bc1cb8caa7 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -982,7 +982,10 @@ QV4::ReturnedValue VME::exec(const FunctionObject *fo, const Value *thisObject, MOTH_BEGIN_INSTR(Construct) STORE_IP(); - acc = Runtime::method_construct(engine, STACK_VALUE(func), stack + argv, argc); +#ifndef Q_OS_HTML5 + // this causes exception on webassembly + acc = Runtime::method_construct(engine, STACK_VALUE(func), stack + argv, argc); +#endif CHECK_EXCEPTION; MOTH_END_INSTR(Construct) diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 451f122cb2..9285328892 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1003,7 +1003,12 @@ struct StaticLoader { void loadThread(QQmlTypeLoader *loader, QQmlDataBlob *blob) const { +#ifdef Q_OS_HTML5 + loader->m_thread->loadWithStaticDataAsync(blob, data); + return; +#else loader->loadWithStaticDataThread(blob, data); +#endif } void load(QQmlTypeLoader *loader, QQmlDataBlob *blob) const { @@ -1040,8 +1045,9 @@ void QQmlTypeLoader::doLoad(const Loader &loader, QQmlDataBlob *blob, Mode mode) qWarning("QQmlTypeLoader::doLoad(%s): %s thread", qPrintable(blob->m_url.toString()), m_thread->isThisThread()?"Compile":"Engine"); #endif - - blob->startLoading(); +#ifdef Q_OS_HTML5 + mode = Asynchronous; +#endif if (m_thread->isThisThread()) { unlock(); loader.loadThread(this, blob); @@ -1049,12 +1055,7 @@ void QQmlTypeLoader::doLoad(const Loader &loader, QQmlDataBlob *blob, Mode mode) } else if (mode == Asynchronous) { blob->m_data.setIsAsync(true); unlock(); - -#ifndef Q_OS_HTML5 - loader.loadThread(this, blob); -#else loader.loadAsync(this, blob); -#endif lock(); } else { unlock(); @@ -1663,7 +1664,7 @@ QQmlTypeData *QQmlTypeLoader::getType(const QUrl &url, Mode mode) } else if ((mode == PreferSynchronous || mode == Synchronous) && QQmlFile::isSynchronous(url)) { // this was started Asynchronous, but we need to force Synchronous // completion now (if at all possible with this type of URL). - +#ifndef Q_OS_HTML5 if (!m_thread->isThisThread()) { // this only works when called directly from the UI thread, but not // when recursively called on the QML thread via resolveTypes() @@ -1674,6 +1675,7 @@ QQmlTypeData *QQmlTypeLoader::getType(const QUrl &url, Mode mode) lock(); } } +#endif } typeData->addref(); @@ -1687,6 +1689,9 @@ QQmlTypeData will not be cached. */ QQmlTypeData *QQmlTypeLoader::getType(const QByteArray &data, const QUrl &url, Mode mode) { +#ifdef Q_OS_HTML5 + mode = Asynchronous; +#endif LockHolder<QQmlTypeLoader> holder(this); QQmlTypeData *typeData = new QQmlTypeData(url, this); diff --git a/src/qml/util/qqmlchangeset.cpp b/src/qml/util/qqmlchangeset.cpp index 79e3332331..ccfd34161f 100644 --- a/src/qml/util/qqmlchangeset.cpp +++ b/src/qml/util/qqmlchangeset.cpp @@ -68,6 +68,7 @@ QT_BEGIN_NAMESPACE QQmlChangeSet::QQmlChangeSet() : m_difference(0) { + qRegisterMetaType<QQmlChangeSet >("QQmlChangeSet"); } /*! @@ -80,6 +81,7 @@ QQmlChangeSet::QQmlChangeSet(const QQmlChangeSet &changeSet) , m_changes(changeSet.m_changes) , m_difference(changeSet.m_difference) { + qRegisterMetaType<QQmlChangeSet >("QQmlChangeSet"); } /*! diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index fca1805fc9..954ea5553a 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -102,7 +102,11 @@ void QQuickViewPrivate::execute() } if (!source.isEmpty()) { QML_MEMORY_SCOPE_URL(engine.data()->baseUrl().resolved(source)); +#ifdef Q_OS_HTML5 + component = new QQmlComponent(engine.data(), source, QQmlComponent::PreferSynchronous, q); +#else component = new QQmlComponent(engine.data(), source, q); +#endif if (!component->isLoading()) { q->continueExecute(); } else { |