You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
1.3 KiB
22 lines
1.3 KiB
5 years ago
|
diff -up qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp.QLibrary-Unix-do-not-attempt-to-load-a-library-relat qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp
|
||
|
|
--- qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp.QLibrary-Unix-do-not-attempt-to-load-a-library-relat 2019-10-25 09:16:48.000000000 +0200
|
||
|
|
+++ qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp 2020-01-20 10:49:23.619299927 +0100
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
/****************************************************************************
|
||
|
|
**
|
||
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
||
|
|
-** Copyright (C) 2018 Intel Corporation
|
||
|
|
+** Copyright (C) 2020 Intel Corporation
|
||
|
|
** Contact: https://www.qt.io/licensing/
|
||
|
|
**
|
||
|
|
** This file is part of the QtCore module of the Qt Toolkit.
|
||
|
|
@@ -208,6 +208,8 @@ bool QLibraryPrivate::load_sys()
|
||
|
|
for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
|
||
|
|
if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix)))
|
||
|
|
continue;
|
||
|
|
+ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/')))
|
||
|
|
+ continue;
|
||
|
|
if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix)))
|
||
|
|
continue;
|
||
|
|
if (loadHints & QLibrary::LoadArchiveMemberHint) {
|