diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-23 11:09:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-23 11:09:15 +0200 |
| commit | 89842727697ce88d752f13eeda17e3521b167872 (patch) | |
| tree | f55abe52686d0509e55c55680a8d6a61ef522b8d /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 1c6e4fbd3211bc180b0de95d232226825bcb124d (diff) | |
| parent | 2e4ed0696ba3aba95d189c7de80853c8a1f53aca (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: I296a61fe43aea134de9e7a6ee8042af3f45f5e99
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 49dd128d28b..e6abb0ad881 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -2033,6 +2033,9 @@ FilePaths BaseQtVersionPrivate::qtCorePaths() else if (file.endsWith(".dll") || file.endsWith(QString::fromLatin1(".so.") + versionString) || file.endsWith(".so") +#if defined(Q_OS_OPENBSD) + || file.contains(QRegularExpression("\\.so\\.[0-9]+\\.[0-9]+$")) // QTCREATORBUG-23818 +#endif || file.endsWith(QLatin1Char('.') + versionString + ".dylib")) dynamicLibs.append(FilePath::fromFileInfo(info)); } |