path: root/src/qml/qml/qqmltypeloader.cpp
diff options
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-09-15 21:48:30 +0200
committerMorten Johan Sørvig <morten.sorvig@qt.io>2016-05-13 13:32:08 +0000
commitb6d3bae80317d854d78b5880d8d46cacd0d1a64e (patch)
tree4ecd01dac33105436efefd123247b02851918a60 /src/qml/qml/qqmltypeloader.cpp
parent872a05475721ad771bd347d1526035e6e7479d30 (diff)
QtDeclarative fixes and workarounds for NaClwip/nacl
Make QtDeclarative run on Native Client. Some of these should be looked at more closely at a later point in time, but will do as workarounds from now. Change-Id: Ifddcb45b190c3a80c6137772a05ababb5466ea22 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 1e671542be..dd6de8f9b3 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1706,9 +1706,14 @@ Returns a QQmlQmldirData for \a url. The QQmlQmldirData may be cached.
QQmlQmldirData *QQmlTypeLoader::getQmldir(const QUrl &url)
+#ifdef Q_OS_NACL
+ // ### NaCl asserts here on urls like "qml/QtQuick.2.1/qmldir",
+ // which are relative urls we want to load over the network.
Q_ASSERT(!url.isRelative() &&
(QQmlFile::urlToLocalFileOrQrc(url).isEmpty() ||
LockHolder<QQmlTypeLoader> holder(this);