diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-20 10:34:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-20 10:34:48 +0200 |
| commit | ad9c70c3bbf293427882ba4dbe878f02a6ba98c7 (patch) | |
| tree | 82bb1e83f4755117beaa9f9446b7abd05fcb0958 /src | |
| parent | cc106ce56550ebfc7e1808e1b9015f5618d9f5e5 (diff) | |
| parent | 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
mkspecs/features/qt_common.prf
src/network/ssl/qsslsocket_openssl_symbols.cpp
src/network/ssl/qsslsocket_openssl11_symbols_p.h
src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
src/plugins/platforms/wasm/qwasmeventdispatcher.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: I04fb3139a0e2efd4bc2f0959f131679f192fa0f8
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmeventdispatcher.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index a020788b11..fe7d7d880b 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -76,6 +76,8 @@ The following operating systems have variants: LINUX - both Q_OS_LINUX and Q_OS_ANDROID are defined when building for Android - only Q_OS_LINUX is defined if building for other Linux systems + MACOS - both Q_OS_BSD4 and Q_OS_IOS are defined when building for iOS + - both Q_OS_BSD4 and Q_OS_MACOS are defined when building for macOS FREEBSD - Q_OS_FREEBSD is defined only when building for FreeBSD with a BSD userland - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU */ diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp index 09acd37abc..2e1b083557 100644 --- a/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp +++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.cpp @@ -195,7 +195,7 @@ void QWasmEventDispatcher::wakeUp() #ifdef EMSCRIPTEN_HAS_ASYNC_RUN_IN_MAIN_RUNTIME_THREAD if (!emscripten_is_main_runtime_thread()) if (m_hasMainLoop) - emscripten_async_run_in_main_runtime_thread_(EM_FUNC_SIG_VI, (void*)(&QWasmEventDispatcher::mainThreadWakeUp), this); + emscripten_async_run_in_main_runtime_thread_(EM_FUNC_SIG_VI, (void*)(&QWasmEventDispatcher::mainThreadWakeUp), this); #endif QEventDispatcherUNIX::wakeUp(); } |