diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-06-30 08:48:52 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-07-16 08:18:17 +0000 |
| commit | 51a614a419e9745d275793e36b6aab295bf1e8e3 (patch) | |
| tree | 7ad6238bf1801d39bfb67d7d6823543d04d48dea /src/corelib/io | |
| parent | 95e9cbb3eef695aa7b1192678c75d4be166b93a0 (diff) | |
wasm: rename platform, refactor files and other things
Task-number: QTBUG-69168
Change-Id: I78a3ad5e16fbb1046eedf2056583c022f7a27d5b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
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) { |