3 files changed, 14 insertions, 10 deletions
diff --git a/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs b/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs
index 56b04227e..066dc26c3 100644
--- a/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs
@@ -48,7 +48,7 @@ Probe {
     property var packages
     property var packagesByModuleName
     property var brokenPackages
-    property varList qtInfos
+    property stringList qmakePaths
 
     configure: {
         var result = PkgConfigProbeConfigure.configure(
@@ -62,7 +62,7 @@ Probe {
         packages = result.packages;
         packagesByModuleName = result.packagesByModuleName;
         brokenPackages = result.brokenPackages;
-        qtInfos = result.qtInfos;
+        qmakePaths = result.qmakePaths;
         found = true;
     }
 }
diff --git a/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js b/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
index 1fb3b26f5..abfa3fcf2 100644
--- a/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
+++ b/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
@@ -34,7 +34,6 @@ var FileInfo = require("qbs.FileInfo");
 var PkgConfig = require("qbs.PkgConfig");
 var ProviderUtils = require("qbs.ProviderUtils");
 var Process = require("qbs.Process");
-var QmakeProbeConfigure = require("qmake-probe.js");
 
 // We should probably use BinaryProbe instead in the provider
 function getPkgConfigExecutable() {
@@ -55,7 +54,7 @@ function getPkgConfigExecutable() {
     return undefined;
 }
 
-function configureQt(pkg) {
+function getQmakePaths(pkg) {
     var packageName = pkg.baseFileName;
     if (packageName === "QtCore"
             || packageName === "Qt5Core"
@@ -75,8 +74,7 @@ function configureQt(pkg) {
             }
         }
         var suffix = FileInfo.executableSuffix();
-        var qmakePaths = [FileInfo.joinPaths(binDir, "qmake" + suffix)];
-        return QmakeProbeConfigure.configure(qmakePaths);
+        return [FileInfo.joinPaths(binDir, "qmake" + suffix)];
     }
 }
 
@@ -131,9 +129,9 @@ function configure(
 
         if (packageName.startsWith("Qt")) {
             if (!sysroot) {
-                var infos = configureQt(pkg);
-                if (infos !== undefined)
-                    result.qtInfos = infos;
+                var qmakePaths = getQmakePaths(pkg);
+                if (qmakePaths !== undefined)
+                    result.qmakePaths = qmakePaths;
             }
         }
     }
diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index 45309c862..648ec8649 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -79,6 +79,12 @@ ModuleProvider {
         _definePrefix: parent.definePrefix
     }
 
+    Probes.QmakeProbe {
+        id: qmakeProbe
+        condition: moduleName.startsWith("Qt") && theProbe.qmakePaths
+        qmakePaths: theProbe.qmakePaths
+    }
+
     isEager: false
 
     relativeSearchPaths: {
@@ -159,7 +165,7 @@ ModuleProvider {
             }
 
             if (!sysroot) {
-                return setupQt(moduleName, theProbe.qtInfos);
+                return setupQt(moduleName, qmakeProbe.qtInfos);
             }
             return [];
         }