summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2018-06-30 18:05:25 +1000
committerLorn Potter <lorn.potter@gmail.com>2018-07-18 19:46:42 +0000
commitf22973008dc7c0c7d91257e46d9a15f903724f0d (patch)
tree950847d075618ec3856ba7a58379ae423e9f17f0
parenta62637358f23546a9edef397fd4d5869a16f0645 (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>
-rw-r--r--src/qml/qml/qqmlimport.cpp2
-rw-r--r--src/qml/qml/qqmltypeloader.cpp4
-rw-r--r--src/qml/qml/v8/qv8engine.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultrendercontext.cpp2
-rw-r--r--tools/tools.pro2
5 files changed, 6 insertions, 6 deletions
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");
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index a6459dbd78..e083847748 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -326,7 +326,7 @@ bool QSGDefaultRenderContext::separateIndexBuffer() const
// target will generate an INVALID_OPERATION error, and the
// current binding will remain untouched.
static const bool isWebGL = (qGuiApp->platformName().compare(QLatin1String("webgl")) == 0
- || qGuiApp->platformName().compare(QLatin1String("html5")) == 0);
+ || qGuiApp->platformName().compare(QLatin1String("webassembly")) == 0);
return isWebGL;
}
diff --git a/tools/tools.pro b/tools/tools.pro
index 8d6308b5c0..2457981458 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -5,7 +5,7 @@ SUBDIRS += \
qmlimportscanner
qtConfig(commandlineparser):qtConfig(xmlstreamwriter): SUBDIRS += qmlcachegen
-!emscripten:!android|android_app {
+!wasm:!android|android_app {
SUBDIRS += \
qml \
qmllint