3 files changed, 7 insertions, 18 deletions
diff --git a/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs b/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
index e0fe73b40..c3d98a49f 100644
--- a/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
@@ -35,10 +35,5 @@ PathProbe {
             "/Library/Frameworks",
             "/System/Library/Frameworks"
         ])
-
-    nameFilter: {
-        return function(name) {
-            return name + ".framework";
-        }
-    }
+    nameSuffixes: ".framework"
 }
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs
index 424a621c6..768defd87 100644
--- a/share/qbs/imports/qbs/Probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs
@@ -38,11 +38,9 @@ Probe {
     property var nameFilter
     property var candidateFilter
     property varList selectors
-    property pathList pathPrefixes
     property pathList searchPaths
     property stringList pathSuffixes
     property pathList platformSearchPaths: hostOS.contains("unix") ? ['/usr', '/usr/local'] : []
-    property pathList platformPaths
     property stringList environmentPaths
     property stringList platformEnvironmentPaths
     property stringList hostOS: qbs.hostOS
@@ -57,15 +55,9 @@ Probe {
     property varList allResults
 
     configure: {
-        if (pathPrefixes)
-            console.warn("PathProbe.pathPrefixes is deprecated, use searchPaths instead");
-        if (platformPaths)
-            console.warn("PathProbe.platformPaths is deprecated, use platformSearchPaths instead");
-        var _searchPaths = ModUtils.concatAll(pathPrefixes, searchPaths);
-        var _platformSearchPaths = ModUtils.concatAll(platformPaths, platformSearchPaths);
         var results = PathProbeConfigure.configure(selectors, names, nameSuffixes, nameFilter,
-                                                   candidateFilter, _searchPaths, pathSuffixes,
-                                                   _platformSearchPaths, environmentPaths,
+                                                   candidateFilter, searchPaths, pathSuffixes,
+                                                   platformSearchPaths, environmentPaths,
                                                    platformEnvironmentPaths, pathListSeparator);
         found = results.found;
         allResults = results.files;
diff --git a/share/qbs/imports/qbs/Probes/path-probe.js b/share/qbs/imports/qbs/Probes/path-probe.js
index a997f77f2..b4d745428 100644
--- a/share/qbs/imports/qbs/Probes/path-probe.js
+++ b/share/qbs/imports/qbs/Probes/path-probe.js
@@ -41,7 +41,7 @@ function asStringList(key, value) {
     throw key + " must be a string or a stringList";
 }
 
-function canonicalSelectors(selectors) {
+function canonicalSelectors(selectors, nameSuffixes) {
     var mapper = function(selector) {
         if (typeof(selector) === "string")
             return {names : [selector]};
@@ -53,6 +53,8 @@ function canonicalSelectors(selectors) {
         selector.names = asStringList("names", selector.names);
         if (selector.nameSuffixes)
             selector.nameSuffixes = asStringList("nameSuffixes", selector.nameSuffixes);
+        else
+            selector.nameSuffixes = nameSuffixes;
         return selector;
     };
     return selectors.map(mapper);
@@ -70,7 +72,7 @@ function configure(selectors, names, nameSuffixes, nameFilter, candidateFilter,
             {names: names, nameSuffixes: nameSuffixes}
         ];
     } else {
-        selectors = canonicalSelectors(selectors);
+        selectors = canonicalSelectors(selectors, nameSuffixes);
     }
 
     if (nameFilter) {