diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-15 10:28:49 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-18 08:42:24 +0000 |
commit | b4929771f461d341aa5d464698d9b59e868c563c (patch) | |
tree | d682e10903925d7ca6fe41c3cb031043a00e00d0 /share | |
parent | c79f4a3dc17b7c8c3caf04f825a8f5866a86c586 (diff) |
Qt provider: Check exit code of qmake -query call
We relied on an exception getting thrown for failed process, but a non-
zero exit code is not technically an error, so we have to check for it
explicitly.
Change-Id: Ibf13ee3022f7ca3753d63be8251c047077dbe240
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index aeea2995b..867110570 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -71,6 +71,10 @@ function getQmakeFilePaths(qmakeFilePaths, qbs) { function queryQmake(qmakeFilePath) { var qmakeProcess = new Process; qmakeProcess.exec(qmakeFilePath, ["-query"]); + if (qmakeProcess.exitCode() !== 0) { + throw "The qmake executable '" + toNative(qmakeFilePath) + "' failed with exit code " + + qmakeProcess.exitCode() + "."; + } var queryResult = {}; while (!qmakeProcess.atEnd()) { var line = qmakeProcess.readLine(); |