diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-11-08 12:30:11 -0500 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-11 09:42:43 +0100 |
commit | a07d905b8231b4d21408bb463eaec616f77f2558 (patch) | |
tree | 51d98eaa5fc7e0943e80a23f78e5d1b908befdb3 /share/qbs/modules/wix | |
parent | b314fe164427b931f2c226512b0603047f8e3103 (diff) |
WiX: add missing qbs. qualifiers.
Task-number: QBS-413
Change-Id: Ic9faab39fba982a98e36dd17c03d1fa34db877dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/wix')
-rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index 55bff0018..7502ab373 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -6,9 +6,9 @@ import "../utils.js" as ModUtils Module { condition: qbs.hostOS.contains("windows") && qbs.targetOS.contains("windows") - property path toolchainInstallPath: getNativeSetting(registryKey, "InstallFolder") - property path toolchainInstallRoot: getNativeSetting(registryKey, "InstallRoot") - property string version: getNativeSetting(registryKey, "ProductVersion") + property path toolchainInstallPath: qbs.getNativeSetting(registryKey, "InstallFolder") + property path toolchainInstallRoot: qbs.getNativeSetting(registryKey, "InstallRoot") + property string version: qbs.getNativeSetting(registryKey, "ProductVersion") property var versionParts: version ? version.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int versionMajor: versionParts[0] property int versionMinor: versionParts[1] @@ -97,9 +97,9 @@ Module { var keyWoW64 = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows Installer XML\\"; for (i in knownVersions) { - if (getNativeSetting(keyNative + knownVersions[i], "ProductVersion")) + if (qbs.getNativeSetting(keyNative + knownVersions[i], "ProductVersion")) return keyNative + knownVersions[i]; - if (getNativeSetting(keyWoW64 + knownVersions[i], "ProductVersion")) + if (qbs.getNativeSetting(keyWoW64 + knownVersions[i], "ProductVersion")) return keyWoW64 + knownVersions[i]; } } |