diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 11:33:45 +0200 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-09-05 00:00:00 +0000 |
| commit | eb6201b2af725d64e5e92f19a512b1ff23ceba51 (patch) | |
| tree | 5ad1717b096f70b90a6ef031de8e5253d64361d8 /src/qml/qml/qqmltypeloader.cpp | |
| parent | f5ad1a13e5ce9ce1389ea7731829ea455259a4db (diff) | |
WebAssembly for QtDeclarative
This is the squashed diff from wip/webassembly to 5.12.
Done-with: Lorn Potter <lorn.potter@gmail.com>
Change-Id: Ieef34accefef38018a66d3c39bfacb825af4bea6
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 739280bbfe..929285d0fa 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1755,10 +1755,14 @@ Returns a QQmlQmldirData for \a url. The QQmlQmldirData may be cached. */ QQmlRefPointer<QQmlQmldirData> QQmlTypeLoader::getQmldir(const QUrl &url) { +#ifndef Q_OS_WASM Q_ASSERT(!url.isRelative() && (QQmlFile::urlToLocalFileOrQrc(url).isEmpty() || !QDir::isRelativePath(QQmlFile::urlToLocalFileOrQrc(url)))); - +#else + // ### wasm asserts on urls like "qml/QtQuick.2.1/qmldir", + // which are relative urls we want to load over the network. +#endif LockHolder<QQmlTypeLoader> holder(this); QQmlQmldirData *qmldirData = m_qmldirCache.value(url); |