Merge remote-tracking branch 'origin/1.11'

Change-Id: I407596d75413e43aa61e7d1fe8591f4a0f388340

1 files changed, 5 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/setuprunenv.js b/share/qbs/modules/cpp/setuprunenv.js
index 5d8bb5248..550d08d63 100644
--- a/share/qbs/modules/cpp/setuprunenv.js
+++ b/share/qbs/modules/cpp/setuprunenv.js
@@ -115,7 +115,11 @@ function setupRunEnvironment(product, config)
 
     var runPaths = product.cpp ? product.cpp.systemRunPaths : undefined;
     if (runPaths && runPaths.length > 0) {
-        var filterFunc = function(p) { return !runPaths.contains(p); };
+        var canonicalRunPaths = runPaths.map(function(p) { return File.canonicalFilePath(p); });
+        var filterFunc = function(libPath) {
+            return !runPaths.contains(libPath)
+                    && !canonicalRunPaths.contains(File.canonicalFilePath(libPath));
+        };
         libPaths = libPaths.filter(filterFunc);
         frameworkPaths = frameworkPaths.filter(filterFunc);
     }