aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js2
-rw-r--r--share/qbs/module-providers/qbspkgconfig.qbs2
2 files changed, 2 insertions, 2 deletions
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 ed75a027c..1fb3b26f5 100644
--- a/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
+++ b/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
@@ -87,7 +87,7 @@ function configure(
result.packages = [];
result.packagesByModuleName = {};
result.brokenPackages = [];
- result.qtInfos = {};
+ result.qtInfos = [];
var options = {};
options.libDirs = libDirs;
diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index 0c6c99293..45309c862 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -152,7 +152,7 @@ ModuleProvider {
if (moduleName.startsWith("Qt")) {
function setupQt(packageName, qtInfos) {
- if (qtInfos === undefined)
+ if (qtInfos === undefined || qtInfos.length === 0)
return [];
var qtProviderDir = FileInfo.joinPaths(path, "Qt");
return SetupQt.doSetup(packageName, qtInfos, outputBaseDir, qtProviderDir);