diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-11 00:44:19 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-12 13:55:57 +0000 |
| commit | 6bf50496ea1fd6d3afd613bb1ce7bb66eead41b6 (patch) | |
| tree | 93da0e4d1d40315eb272bd7c1f9bb16b2db121b2 | |
| parent | 607706b8abf51fafac12ecd78255e3fe451ef338 (diff) | |
Enable relative url assert again on Q_OS_WASM
This reverts parts of commit eb6201b2af725d64e5e92f19a512b1ff23ceba51
Change-Id: Ib6ffd7ce297c597841de147c2bdd1ab22cee5e52
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 0b0ee9cb9a..0b0c6242ba 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1765,14 +1765,9 @@ 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); |