summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2017-05-12 12:24:20 +0300
committerKatja Marttila <katja.marttila@qt.io>2017-05-15 06:02:49 +0000
commit22f1cdee075ab168c70b219a71fe221b60a40382 (patch)
tree6c98764277c7b2c43afbf66c8d1ba91658f0525f
parent22d340e39e119b32baf18f206c7363743119b9c8 (diff)
Ignore used separators when comparing file names
The separations might differ in QDirIterator and excludeFiles. Make sure that same separators are used when comparing the values. Change-Id: Ib1c810150e600cd647f5b3a24565268b79f4b09f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 2cc6d298d..28d64d09c 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2430,8 +2430,10 @@ void PackageManagerCorePrivate::findExecutablesRecursive(const QString &path, co
while (it.hasNext()) {
executable = it.next();
foreach (QString exclude, excludeFiles) {
- if (executable.compare(exclude, Qt::CaseInsensitive) != 0)
+ if (QDir::toNativeSeparators(executable.toLower())
+ != QDir::toNativeSeparators(exclude.toLower())) {
result->append(executable);
+ }
}
}
}