diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/config.xml | 1 | ||||
| -rw-r--r-- | doc/installerfw.qdoc | 20 | ||||
| -rw-r--r-- | doc/operations.qdoc | 4 |
3 files changed, 19 insertions, 6 deletions
diff --git a/doc/examples/config.xml b/doc/examples/config.xml index c234bab25..daf212711 100644 --- a/doc/examples/config.xml +++ b/doc/examples/config.xml @@ -8,6 +8,7 @@ <Logo>logo.png</Logo> <Watermark>watermark.png</Watermark> <RunProgram></RunProgram> + <RunProgramArguments></RunProgramArguments> <RunProgramDescription></RunProgramDescription> <StartMenuDir>Some Application Entry Dir</StartMenuDir> <UninstallerName>SDKMaintenanceTool</UninstallerName> diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 3984429e8..202d642b4 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -182,7 +182,15 @@ \row \o Icon \o Filename for a custom installer icon. The actual file is looked up by attaching - a '.icns' (Mac OS X), '.ico' (Windows) or '.png' (Unix) suffix. + a '.icns' (Mac OS X), '.ico' (Windows) or '.png' (Unix) suffix. Deprecated, + use InstallerApplicationIcon and / or InstallerWindowIcon instead. + \row + \o InstallerApplicationIcon + \o Filename for a custom installer icon. The actual file is looked up by attaching + a '.icns' (Mac OS X), '.ico' (Windows). No functionality on Unix. + \row + \o InstallerWindowIcon + \o Filename for a custom window icon in PNG format for the Installer application. \row \o Logo \o Filename for a logo used as \a QWizard::LogoPixmap. @@ -190,6 +198,9 @@ \o Watermark \o Filename for a watermark used as \a QWizard::WatermarkPixmap. \row + \o Banner + \o Filename for a banner used as \a QWizard::BannerPixmap. + \row \o Background \o Filename for an image used as \a QWizard::BackgroundPixmap. \row @@ -197,6 +208,9 @@ \o Command executed after the installer is done if the user accepts the action. \row + \o RunProgramArguments + \o Arguments passed to the program specified in RunProgram. + \row \o RunProgramDescription \o Text shown next to the check box for running the program after the installation. Defaults to \gui {Run <Name>}. @@ -246,10 +260,6 @@ \row \o TargetConfigurationFile \o Filename for the configuration file on the target. Default is components.xml. - \row - \o Pages - \o Custom strings for labels in the installer pages. Deprecated, - see \l{Translating Pages} instead. \endtable */ diff --git a/doc/operations.qdoc b/doc/operations.qdoc index b187a20cf..2a29a519d 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -132,13 +132,15 @@ The file is set to use UTF-8 encoding. \row \o InstallIcons - \o "InstallIcons" \a directory + \o "InstallIcons" \a directory \a [Vendorprefix] \o Installs the contents of \a directory into a location, as specified by freedesktop.org. That is, into \c {$XDG_DATA_DIRS/icons}, \c {/usr/share/icons}, or \c {$HOME/.icons}. The files are removed from their initial location. Make sure to add this operation after the operation that extracts the files from the archive. + If you provide a \a Vendorprefix it replaces all characters up to the + first dash (-) in the filename of the icon with this prefix. \row \o Extract \o "Extract" \a archive \a targetdirectory |