diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2024-01-21 01:12:22 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-01-22 13:31:32 +0000 |
commit | e45a00bcbc37c037ca1da0629dbeecf4037c98aa (patch) | |
tree | c9488ad0f6c5973f45f204f6a407ae2aa220b75f /share/qbs/module-providers/qbspkgconfig.qbs | |
parent | 86d7bf69ca1dea54cfde6ed932208d4eecf6278a (diff) |
qbspkgconfig: do not run qmake when not requested
Fix the probe by returning only paths to qmake
which are later passed to real Qmake probe which
checks if it should be run (e,g. for Qt modules).
This amends d99256dd79460628aafb5fa34a8dde7761ff7b1c.
Fixes: QBS-1779
Change-Id: Ie901befcc74713a41258ba18c436435fe50cfb4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/module-providers/qbspkgconfig.qbs')
-rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 8 |
1 files changed, 7 insertions, 1 deletions
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 []; } |