diff options
| author | Niels Weber <niels.weber@digia.com> | 2013-04-10 11:35:04 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2013-08-09 13:54:30 +0200 |
| commit | 08da7883d098a372fbfab1d64756ff89c52568c7 (patch) | |
| tree | 9cb4ac56cd70eae2ed56228e05e97ddc213a39f7 /src/libs/installer | |
| parent | f8cf479851a7c2465644eb43e92a9b98eb27297f (diff) | |
Add some more paths to default in findLibrary.
Also split Mac and Linux default paths.
Change-Id: I68c62d05688a4fb1af2d277581ad25ded04aae71
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 99e3087e7..9543aca5e 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1625,15 +1625,23 @@ QString PackageManagerCore::findLibrary(const QString &name, const QStringList & #if defined(Q_OS_WIN) return findPath(QString::fromLatin1("%1.lib").arg(name), findPaths); #else +#if defined(Q_OS_MAC) if (findPaths.isEmpty()) { findPaths.push_back(QLatin1String("/lib")); findPaths.push_back(QLatin1String("/usr/lib")); findPaths.push_back(QLatin1String("/usr/local/lib")); findPaths.push_back(QLatin1String("/opt/local/lib")); } -#if defined(Q_OS_MAC) const QString dynamic = findPath(QString::fromLatin1("lib%1.dylib").arg(name), findPaths); #else + if (findPaths.isEmpty()) { + findPaths.push_back(QLatin1String("/lib")); + findPaths.push_back(QLatin1String("/usr/lib")); + findPaths.push_back(QLatin1String("/usr/local/lib")); + findPaths.push_back(QLatin1String("/lib64")); + findPaths.push_back(QLatin1String("/usr/lib64")); + findPaths.push_back(QLatin1String("/usr/local/lib64")); + } const QString dynamic = findPath(QString::fromLatin1("lib%1.so*").arg(name), findPaths); #endif if (!dynamic.isEmpty()) |