From 6bf50496ea1fd6d3afd613bb1ce7bb66eead41b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Tue, 11 Sep 2018 00:44:19 +0200
Subject: 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>
---
 src/qml/qml/qqmltypeloader.cpp | 5 -----
 1 file changed, 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);
-- 
cgit v1.2.3