diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-03-20 10:36:43 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2018-09-03 08:21:47 +0000 |
| commit | e0213d1939ac6f78e9e8b54d4e974fa32f75026a (patch) | |
| tree | 8a54ad528b34957956345bc7ab0840bc900d67a8 /src/corelib | |
| parent | c82d043de129ce3cb395b649cb8a7a20342c01fd (diff) | |
Android: Fix crash
Android doesn't like nor use RTLD_NODELETE
Tasnk-number: QTBUG-64654
Change-Id: I2d884bbf22a681cca592942eba84ba97327ba974
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 851b9ff82f..e03814984c 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -157,7 +157,7 @@ bool QLibraryPrivate::load_sys() // Do not unload the library during dlclose(). Consequently, the // library's specific static variables are not reinitialized if the // library is reloaded with dlopen() at a later time. -#ifdef RTLD_NODELETE +#if defined(RTLD_NODELETE) && !defined(Q_OS_ANDROID) if (loadHints & QLibrary::PreventUnloadHint) { dlFlags |= RTLD_NODELETE; } |