diff options
author | Filipe Azevedo <filipe.azevedo@kdab.com> | 2018-08-22 17:19:14 +0200 |
---|---|---|
committer | Filipe Azevedo <filipe.azevedo@kdab.com> | 2019-01-07 13:17:09 +0000 |
commit | 1700699fdee5beaab8600750334649d0c596c853 (patch) | |
tree | d59dafc7c4efb0b7025e4c4c28862b0d3819308f /src/macdeployqt | |
parent | 7b23692538f55d499bf094a750311e1e4cd13ec6 (diff) |
Avoid considering symlinks as bundle libraries
They already point to a regular file that will be hit at some point.
Change-Id: Iaa4818090b41bf5a2ecea29f4ae5a8b4f5641059
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/macdeployqt')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index bba71d9d1..a94f07f05 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -418,7 +418,8 @@ QStringList findAppFrameworkNames(const QString &appBundlePath) // populate the frameworks list with QtFoo.framework etc, // as found in /Contents/Frameworks/ QString searchPath = appBundlePath + "/Contents/Frameworks/"; - QDirIterator iter(searchPath, QStringList() << QString::fromLatin1("*.framework"), QDir::Dirs); + QDirIterator iter(searchPath, QStringList() << QString::fromLatin1("*.framework"), + QDir::Dirs | QDir::NoSymLinks); while (iter.hasNext()) { iter.next(); frameworks << iter.fileInfo().fileName(); @@ -431,7 +432,8 @@ QStringList findAppFrameworkPaths(const QString &appBundlePath) { QStringList frameworks; QString searchPath = appBundlePath + "/Contents/Frameworks/"; - QDirIterator iter(searchPath, QStringList() << QString::fromLatin1("*.framework"), QDir::Dirs); + QDirIterator iter(searchPath, QStringList() << QString::fromLatin1("*.framework"), + QDir::Dirs | QDir::NoSymLinks); while (iter.hasNext()) { iter.next(); frameworks << iter.fileInfo().filePath(); @@ -445,8 +447,7 @@ QStringList findAppLibraries(const QString &appBundlePath) QStringList result; // dylibs QDirIterator iter(appBundlePath, QStringList() << QString::fromLatin1("*.dylib"), - QDir::Files, QDirIterator::Subdirectories); - + QDir::Files | QDir::NoSymLinks, QDirIterator::Subdirectories); while (iter.hasNext()) { iter.next(); result << iter.fileInfo().filePath(); |