diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-09-01 23:38:04 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-04 11:34:45 +0000 |
| commit | cea2c74d67822c21a45a7fe734b11c794a6355c4 (patch) | |
| tree | 8289a3edda4a9f1c20d4a091eb89a536814c04c4 /share/qbs/modules | |
| parent | 27bbf57af385edde72b914ccdbe0f1d4d7c83144 (diff) | |
Fix InnoSetupModule to support InnoSetup v6
Also, fix tests to check the presence of the innosetup in qbs files
instead of the test itself
Change-Id: I5fcb40cf301cf606c2cf3414a716ed66d1083868
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/innosetup/InnoSetupModule.qbs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/share/qbs/modules/innosetup/InnoSetupModule.qbs b/share/qbs/modules/innosetup/InnoSetupModule.qbs index 1caf39dc8..930d85a9a 100644 --- a/share/qbs/modules/innosetup/InnoSetupModule.qbs +++ b/share/qbs/modules/innosetup/InnoSetupModule.qbs @@ -76,6 +76,10 @@ Module { readonly property string executableSuffix: ".exe" validate: { + if (!innoSetupProbe.found) { + throw ModUtils.ModuleError("Could not find InnoSetup in Windows registry. Make " + + "sure InnoSetup is installed correctly."); + } var validator = new ModUtils.PropertyValidator("innosetup"); validator.setRequiredProperty("toolchainInstallPath", toolchainInstallPath); validator.setRequiredProperty("version", version); |