diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-06-30 18:05:25 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-07-18 19:46:42 +0000 |
| commit | f22973008dc7c0c7d91257e46d9a15f903724f0d (patch) | |
| tree | 950847d075618ec3856ba7a58379ae423e9f17f0 /src/qml/qml/qqmltypeloader.cpp | |
| parent | a62637358f23546a9edef397fd4d5869a16f0645 (diff) | |
wasm: rename Q_OS_HTML5 to Q_OS_WASM to reflect qtbasewip/webassembly
Change-Id: I088ae6e7d7c16a88cc6bcf2eb97898db83df4724
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 70ef3d82ff..994db54db5 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1774,7 +1774,7 @@ Returns a QQmlQmldirData for \a url. The QQmlQmldirData may be cached. */ QQmlQmldirData *QQmlTypeLoader::getQmldir(const QUrl &url) { -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM // ### asserts here on urls like "qml/QtQuick.2.1/qmldir", // which are relative urls we want to load over the network. #else @@ -2447,7 +2447,7 @@ bool QQmlTypeData::loadImplicitImport() void QQmlTypeData::dataReceived(const SourceCodeData &data) { m_backupSourceCode = data; -#ifndef Q_OS_HTML5 +#ifndef Q_OS_WASM if (tryLoadFromDiskCache()) return; #endif |