1 files changed, 12 insertions, 5 deletions
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs
index 1235ce211..d0edea682 100644
--- a/share/qbs/imports/qbs/Probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs
@@ -36,6 +36,8 @@ Probe {
     property stringList names
     property stringList nameSuffixes
     property var nameFilter
+    property var candidateFilter
+    property varList selectors
     property pathList pathPrefixes
     property pathList searchPaths
     property stringList pathSuffixes
@@ -52,6 +54,8 @@ Probe {
     property string filePath
     property string fileName
 
+    property varList allResults
+
     configure: {
         if (pathPrefixes)
             console.warn("PathProbe.pathPrefixes is deprecated, use searchPaths instead");
@@ -59,11 +63,14 @@ Probe {
             console.warn("PathProbe.platformPaths is deprecated, use platformSearchPaths instead");
         var _searchPaths = ModUtils.concatAll(pathPrefixes, searchPaths);
         var _platformSearchPaths = ModUtils.concatAll(platformPaths, platformSearchPaths);
-        var result = PathProbeConfigure.configure(names, nameSuffixes, nameFilter, _searchPaths,
-                                                  pathSuffixes, _platformSearchPaths,
-                                                  environmentPaths, platformEnvironmentPaths,
-                                                  pathListSeparator);
-        found = result.found;
+        var results = PathProbeConfigure.configure(selectors, names, nameSuffixes, nameFilter,
+                                                   candidateFilter, _searchPaths, pathSuffixes,
+                                                   _platformSearchPaths, environmentPaths,
+                                                   platformEnvironmentPaths, pathListSeparator);
+        found = results.found;
+        allResults = results.files;
+
+        var result = allResults[0];
         candidatePaths = result.candidatePaths;
         path = result.path;
         filePath = result.filePath;