diff options
| author | Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com> | 2015-01-16 13:17:22 +0100 |
|---|---|---|
| committer | Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com> | 2015-01-20 17:01:39 +0100 |
| commit | 552d964c6f0c3e9e9addc9b97eb247a039b6d140 (patch) | |
| tree | 2fa02ed39fcc7fc65cc97363d765f97f67749d32 /doc | |
| parent | 36a9594bce7b6e0be22446734dede93a31e95ed3 (diff) | |
no longer use Version as the repository format version
Use the Version value defined in config.xml as the product version
exclusively instead of sometimes using it as the repository format
version in components.xml (which must be 1.0.0) and sometimes as the
product version.
Change-Id: I63864947bf131ac6e246a2aaf6febdda0555c13d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/includes/installerfw-examples-configuring.qdocinc | 3 | ||||
| -rw-r--r-- | doc/installerfw.qdoc | 5 | ||||
| -rw-r--r-- | doc/tutorial.qdoc | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/includes/installerfw-examples-configuring.qdocinc b/doc/includes/installerfw-examples-configuring.qdocinc index 9f4d6161c..3a29af3dc 100644 --- a/doc/includes/installerfw-examples-configuring.qdocinc +++ b/doc/includes/installerfw-examples-configuring.qdocinc @@ -6,8 +6,7 @@ \list \li The \c <Name> element specifies the application name that is added to the page name and introduction text. - \li The \c <Version> element specifies the version number of the - repository format, and must be set to \c 1.0.0. + \li The \c <Version> element specifies the application version number. \li The \c <Title> element specifies the installer name displayed on the title bar. \li The \c <Publisher> element specifies the publisher of the software diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index d759462b4..5c981fb57 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -175,8 +175,9 @@ \li Name of the product being installed. This is mandatory. \row \li Version - \li Version number of the repository format. This is mandatory and - must always be set to \c 1.0.0. + \li Version of the product being installed in the following format: + [0-9]+((\\.|-)[0-9]+)* such as 1-1; 1.2-2; 3.4.7. This is + mandatory. \row \li Title \li Name of the installer as displayed on the title bar. diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index e9fad20a0..4360c0125 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -100,8 +100,7 @@ \list - \li The \c <Version> element specifies the version number of the - repository format, and must be set to \c 1.0.0. + \li The \c <Version> element specifies the application version number. \li The \c <Publisher> element specifies the publisher of the software (as shown in the Windows Control Panel, for example). |