1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: don't call dlopen() on static builds

Browse Source 
Make QLibraryPrivate::load_sys() return false on static
wasm builds.

Emscripten does not support dlopen() in this configuration;
calling it will abort the program. By returning false
we give QLibrary users an opportunity to handle the
error.

Task-number: QTBUG-109076
Change-Id: I32d1fde04cc54d1622e0743712b6372b023aa006
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
(cherry picked from commit 490c4558f79ff4ca95a1ff1ccbe5a3d956786e77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Morten Sørvig 2023-02-13 14:17:55 +01:00 committed by Qt Cherry-pick Bot
parent e59faa2798
commit 561b48c76b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/plugin/qlibrary_unix.cpp
View File

@ -90,6 +90,11 @@ QStringList QLibraryPrivate::prefixes_sys()
bool QLibraryPrivate::load_sys() bool QLibraryPrivate::load_sys()
{ {
#if defined(Q_OS_WASM) && defined(QT_STATIC)
// emscripten does not support dlopen when using static linking
return false;
#endif
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
QString attempt; QString attempt;
QFileSystemEntry fsEntry(fileName); QFileSystemEntry fsEntry(fileName);