From f22973008dc7c0c7d91257e46d9a15f903724f0d Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@gmail.com>
Date: Sat, 30 Jun 2018 18:05:25 +1000
Subject: wasm: rename Q_OS_HTML5 to Q_OS_WASM to reflect qtbase

Change-Id: I088ae6e7d7c16a88cc6bcf2eb97898db83df4724
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 src/qml/qml/qqmlimport.cpp     | 2 +-
 src/qml/qml/qqmltypeloader.cpp | 4 ++--
 src/qml/qml/v8/qv8engine.cpp   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/qml')

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index bfbfd2e76a..9f7fa624d1 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1756,7 +1756,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
 {
     filePluginPath << QLatin1String(".");
     // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
        // Hardcode the qml imports to "qml/" relative to the app nexe.
        // This should perhaps be set via Qml2Imports in qt.conf.
       QString installImportsPath = QStringLiteral("qml/");
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
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index bdb066267a..e5f003f8df 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -129,7 +129,7 @@ QV8Engine::QV8Engine(QJSEngine *qq, QV4::ExecutionEngine *v4)
     , m_v4Engine(v4)
     , m_xmlHttpRequestData(nullptr)
 {
-#ifndef Q_OS_HTML5
+#ifndef Q_OS_WASM
 #ifdef Q_PROCESSOR_X86_32
     if (!qCpuHasFeature(SSE2)) {
         qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
-- 
cgit v1.2.3