From 2ce35b8d9d3f33be3039956812ac7b25b459f83f Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Thu, 31 Oct 2013 13:57:19 -0400
Subject: Improve the way that the WiX installation is found.

Now that we have registry access, we search the registry for the key
corresponding to the latest known WiX version, then determine the WiX
installation path and version number from that. The latter is now
available as a set of properties.

This searching code is also now not broken for 32-bit Windows...

Task-number: QBS-413
Change-Id: I2fae8164b4aa073c1b0b980f110af38a1c4ddc66
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 doc/reference/modules/wix-module.qdoc | 68 +++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/reference/modules/wix-module.qdoc b/doc/reference/modules/wix-module.qdoc
index 58612b784..6184bc6eb 100644
--- a/doc/reference/modules/wix-module.qdoc
+++ b/doc/reference/modules/wix-module.qdoc
@@ -179,6 +179,61 @@
 
     List of extension assemblies to link into the output.
 
+    \section2 version
+
+    \table
+    \row    \li \b{Type:}            \li \c{string}
+    \row    \li \b{Default:}         \li \c{undefined}
+    \endtable
+
+    The WiX version. Consists of four numbers separated by dots, for instance "3.7.1224.0".
+
+    \section2 versionMajor
+
+    \table
+    \row    \li \b{Type:}            \li \c{int}
+    \row    \li \b{Default:}         \li \c{versionParts[0]}
+    \endtable
+
+    The WiX major version.
+
+    \section2 versionMinor
+
+    \table
+    \row    \li \b{Type:}            \li \c{int}
+    \row    \li \b{Default:}         \li \c{versionParts[1]}
+    \endtable
+
+    The WiX minor version.
+
+    \section2 versionParts
+
+    \table
+    \row    \li \b{Type:}            \li \c{list}
+    \row    \li \b{Default:}         \li \c{empty}
+    \endtable
+
+    The WiX version as a list. For instance, WiX version 3.7.1224.0 would correspond to a value of
+    \c[3, 7, 1224, 0].
+
+    \section2 versionPatch
+
+    \table
+    \row    \li \b{Type:}            \li \c{int}
+    \row    \li \b{Default:}         \li \c{versionParts[2]}
+    \endtable
+
+    The WiX patch level.
+
+    \section2 versionBuild
+
+    \table
+    \row    \li \b{Type:}            \li \c{int}
+    \row    \li \b{Default:}         \li \c{versionParts[3]}
+    \endtable
+
+    The fourth WiX version number component.
+
     \section2 toolchainInstallPath
 
     \table
@@ -186,8 +241,17 @@
     \row    \li \b{Default:}         \li determined automatically
     \endtable
 
-    WiX installation directory. Determined by searching the \c{WIX} environment variable,
-    known registry keys, and known installation paths until a match is found.
+    WiX installation directory. Determined by searching the registry for the latest version.
+    This should not normally need to be changed.
+
+    \section2 toolchainInstallRoot
+
+    \table
+    \row    \li \b{Type:}            \li \c{path}
+    \row    \li \b{Default:}         \li determined automatically
+    \endtable
+
+    WiX binaries directory. Determined by searching the registry for the latest version.
     This should not normally need to be changed.
 
     \section2 compilerName
-- 
cgit v1.2.1