summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2011-08-09 14:09:24 +0200
committerNiels Weber <niels.2.weber@nokia.com>2011-08-09 14:10:08 +0200
commit70dc0bfe77bfce6ce28e026c541a966f994f6f2c (patch)
treee873d859e1c37a69fbf5d95607cd2d9e330287c5 /doc
parente9d63e21b349cbbb6a9629686cc2b821cf232f57 (diff)
small doc improvements
Reviewed-by: kh1
Diffstat (limited to 'doc')
-rw-r--r--doc/installerfw.qdoc17
-rw-r--r--doc/installerfw.qdocconf4
2 files changed, 9 insertions, 12 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index dede885f0..08ab5a2e2 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -11,7 +11,7 @@
\title Qt Installer Framework Manual
- \section1 Version 1.0.1
+ \section1 Version 1.2.0
The Qt Installer Framework provides a set of tools and utilities to
create installers for all supported desktop Qt platforms.
@@ -19,7 +19,7 @@
Tested platforms currently include:
\list
\o Microsoft Windows (Windows XP and following)
- \o Linux (Ubuntu 7.04 and following)
+ \o Linux (Ubuntu 8.04 and following)
\o Mac OS-X (10.6 and following)
\endlist
@@ -30,9 +30,8 @@
published on the server.
- \note Currently there is no bug report system setup for the Qt Installer
- Framework itself as it is not productized. Please report bugs and
- suggestions to the developers personally via email.
+ \note Please report bugs in the Nokia Qt SDK bugtracking system
+ \l{http://bugreports.qt.nokia.com/browse/QTSDK}{here}.
\list
\o Structure of a installer creation setup
@@ -211,11 +210,11 @@
\code
<?xml version="1.0"?>
<Package>
- <Name>QtGui</Name>
+ <DisplayName>QtGui</DisplayName>
<Description>Qt gui libraries</Description>
<Version>1.2.3</Version>
<ReleaseDate>2009-04-23</ReleaseDate>
- <Identifier>com.vendor.root.component2</Identifier>
+ <Name>com.vendor.root.component2</Name>
<Dependencies>com.vendor.root.component1</Dependencies>
<Virtual>false</Virtual>
<Script>installscript.qs</Script>
@@ -233,7 +232,7 @@
\section3 package value list
\list
- \o \bold{VisibleName} The human readable name of the component - required.
+ \o \bold{DisplayName} The human readable name of the component - required.
\o \bold{Description} The human readable description of the component - required.
\o \bold{Version} The version number of the component needs the following format: [0-9]+((\.|-)[0-9]+)* such as 1-1; 1.2-2; 3.4.7 - required.
\o \bold{ReleaseDate} The day this component version was released - optional.
@@ -645,8 +644,6 @@
\title Known Issues
- Of course none yet, but as long as there is no bugtracker, add those here...
-
Some of the items can be seen on the Nokia Qt SDK bugtracking system
\l{http://bugreports.qt.nokia.com/browse/QTSDK}{here}.
*/
diff --git a/doc/installerfw.qdocconf b/doc/installerfw.qdocconf
index fb56c561a..6513e3d52 100644
--- a/doc/installerfw.qdocconf
+++ b/doc/installerfw.qdocconf
@@ -23,12 +23,12 @@ sources.fileextensions = "installerfw.qdoc scripting.qdoc tutorial.qdoc noninte
qhp.projects = InstallerFramework
qhp.InstallerFramework.file = installerfw.qhp
-qhp.InstallerFramework.namespace = com.nokia.qt.installerfw.101
+qhp.InstallerFramework.namespace = com.nokia.qt.installerfw.120
qhp.InstallerFramework.virtualFolder = doc
qhp.InstallerFramework.indexTitle = Qt Installer Framework Manual
qhp.InstallerFramework.indexRoot =
qhp.InstallerFramework.filterAttributes = installerfw
-qhp.InstallerFramework.customFilters.InstallerFramework.name = Qt Installer Framework 1.0.0
+qhp.InstallerFramework.customFilters.InstallerFramework.name = Qt Installer Framework 1.2.0
qhp.InstallerFramework.customFilters.InstallerFramework.filterAttributes = installerfw
qhp.InstallerFramework.subprojects = scripting manual