summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/codecs/qtextcodec_p.h2
-rw-r--r--src/corelib/global/qsystemdetection.h2
-rw-r--r--src/corelib/io/qfilesystemengine_unix.cpp8
-rw-r--r--src/corelib/io/qsettings.cpp4
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp6
-rw-r--r--src/corelib/kernel/qeventdispatcher_unix.cpp2
-rw-r--r--src/corelib/kernel/qeventloop.cpp6
-rw-r--r--src/corelib/mimetypes/qmimedatabase.cpp2
-rw-r--r--src/corelib/plugin/qlibrary.h2
-rw-r--r--src/corelib/tools/tools.pri2
10 files changed, 18 insertions, 18 deletions
diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h
index 7635fce2af..be0cab93e6 100644
--- a/src/corelib/codecs/qtextcodec_p.h
+++ b/src/corelib/codecs/qtextcodec_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_TEXTCODEC
-#if defined(Q_OS_MAC) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_HTML5)
+#if defined(Q_OS_MAC) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WASM)
#define QT_LOCALE_IS_UTF8
#endif
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index 96dd9aa9bf..2600f7b661 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -138,7 +138,7 @@
#elif defined(__native_client__)
# define Q_OS_NACL
#elif defined(__EMSCRIPTEN__)
-# define Q_OS_HTML5
+# define Q_OS_WASM
#elif defined(__linux__) || defined(__linux)
# define Q_OS_LINUX
#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 5561ecbb6d..71a7fc7d42 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -859,10 +859,10 @@ QString QFileSystemEngine::resolveUserName(uint userId)
size_max = 1024;
QVarLengthArray<char, 1024> buf(size_max);
#endif
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
Q_UNUSED(userId)
#endif
-#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_HTML5)
+#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM)
struct passwd *pw = 0;
#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS)
struct passwd entry;
@@ -885,10 +885,10 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
size_max = 1024;
QVarLengthArray<char, 1024> buf(size_max);
#endif
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
Q_UNUSED(groupId)
#endif
-#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_HTML5)
+#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM)
struct group *gr = 0;
#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24))
size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index e3d78e7fd4..6d83b34a8b 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -77,7 +77,7 @@
# include <ioLib.h>
#endif
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
#include <emscripten.h>
#endif
@@ -1548,7 +1548,7 @@ void QConfFileSettingsPrivate::syncConfFile(QConfFile *confFile)
perms |= QFile::ReadGroup | QFile::ReadOther;
QFile(confFile->name).setPermissions(perms);
}
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
EM_ASM(
Module.print("Start QSettings Emscripten current data to persistent Indexed Db");
FS.syncfs(false, function(err) {
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 7ddc6186a1..1ff9275935 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -116,7 +116,7 @@
# include <taskLib.h>
#endif
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
#include <emscripten.h>
#endif
@@ -503,7 +503,7 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint
QCoreApplicationPrivate::~QCoreApplicationPrivate()
{
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
EM_ASM(
//unmount persistent directory as IDBFS
FS.unmount('/home/web_user');
@@ -801,7 +801,7 @@ void QCoreApplicationPrivate::init()
Q_ASSERT_X(!QCoreApplication::self, "QCoreApplication", "there should be only one application object");
QCoreApplication::self = q;
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
EM_ASM(
Module.print("mount persistent directory as IDBFS");
FS.mount(IDBFS, {}, '/home/web_user');
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 85846c3f6f..535f86fefe 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -130,7 +130,7 @@ static void initThreadPipeFD(int fd)
bool QThreadPipe::init()
{
-#if defined(Q_OS_NACL) || defined(Q_OS_HTML5)
+#if defined(Q_OS_NACL) || defined(Q_OS_WASM)
// do nothing.
#elif defined(Q_OS_VXWORKS)
qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdSelf()));
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index e9f26e5070..502b075f98 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -49,7 +49,7 @@
#include <private/qthread_p.h>
#include <QDebug>
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
#include <emscripten.h>
#endif
@@ -215,7 +215,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
if (app && app->thread() == thread())
QCoreApplication::removePostedEvents(app, QEvent::Quit);
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
// Partial support for nested event loops: Make the runtime throw a JavaSrcript
// exception, which returns control to the browser while preserving the C++ stack.
// Event processing then continues as normal. The sleep call below newer returns.
@@ -285,7 +285,7 @@ void QEventLoop::exit(int returnCode)
d->exit.storeRelease(true);
d->threadData->eventDispatcher.load()->interrupt();
-#ifdef Q_OS_HTML5
+#ifdef Q_OS_WASM
// QEventLoop::exec() never returns. We implement opproximate behavior here.
if (d->threadData->loopLevel == 1) {
emscripten_force_exit(returnCode);
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index d5f8b4a71b..f0a9486a7c 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -151,7 +151,7 @@ void QMimeDatabasePrivate::loadProviders()
QVector<QMimeProviderBase *> QMimeDatabasePrivate::providers()
{
-#ifndef Q_OS_HTML5 //we dont have working mutex locks
+#ifndef Q_OS_WASM //we dont have working mutex locks
Q_ASSERT(!mutex.tryLock()); // caller should have locked mutex
#endif
if (m_providers.isEmpty()) {
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h
index fe60d36277..4337f338d8 100644
--- a/src/corelib/plugin/qlibrary.h
+++ b/src/corelib/plugin/qlibrary.h
@@ -42,7 +42,7 @@
#include <QtCore/qobject.h>
-#ifndef Q_OS_HTML5
+#ifndef Q_OS_WASM
QT_REQUIRE_CONFIG(library);
#endif
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 4cd38d67f9..4d6c969592 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -216,7 +216,7 @@ qtConfig(system-doubleconversion) {
}
# Note: libm should be present by default becaue this is C++
-unix:!macx-icc:!vxworks:!haiku:!integrity:!html5: LIBS_PRIVATE += -lm
+unix:!macx-icc:!vxworks:!haiku:!integrity:!wasm: LIBS_PRIVATE += -lm
TR_EXCLUDE += ../3rdparty/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 08:04:42 +0000