summaryrefslogtreecommitdiffstats
path: root/doc/installerfw.qdoc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2014-06-17 12:54:22 +0200
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2014-06-17 13:37:06 +0200
commitfca941d00a8673b2ceb4132035c8e035b47a0601 (patch)
tree4820b960d75ccf6d0e7584abf3750b72d3f4baf5 /doc/installerfw.qdoc
parent8bc8eaf45a40b043f094d2502dab61014730ff35 (diff)
Doc: replace "Max OS X" with "OS X"
According to Apple naming conventions. Change-Id: I4e7e5334987543118ae18d8547f58d01260f2493 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'doc/installerfw.qdoc')
-rw-r--r--doc/installerfw.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index e496df9c4..66d2da285 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -42,7 +42,7 @@
The Qt Installer Framework provides a set of tools and utilities to
create installers for the supported desktop Qt platforms: Linux, Microsoft
- Windows, and Mac OS X.
+ Windows, and OS X.
\note Report bugs and suggestions for the Qt Installer Framework project
in the \l{https://bugreports.qt-project.org/browse/QTIFW}{Qt Bugtracker}.
@@ -182,12 +182,12 @@
\row
\li Icon
\li 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. Deprecated,
+ a '.icns' (OS X), '.ico' (Windows) or '.png' (Unix) suffix. Deprecated,
use InstallerApplicationIcon and / or InstallerWindowIcon instead.
\row
\li InstallerApplicationIcon
\li 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.
+ a '.icns' (OS X), '.ico' (Windows). No functionality on Unix.
\row
\li InstallerWindowIcon
\li Filename for a custom window icon in PNG format for the Installer application.
@@ -621,7 +621,7 @@
<location-of-ifw>\binarycreator.exe -t <location-of-ifw>\installerbase.exe -p <package_directory> -c <config_directory>\<config_file> <installer_name>
\endcode
- \li On Linux and Mac OS X
+ \li On Linux and OS X
\code
<location-of-ifw>/binarycreator -t <location-of-ifw>/installerbase -p <package_directory> -c <config_directory>/<config_file> <installer_name>
@@ -639,7 +639,7 @@
<location-of-ifw>\binarycreator.exe -t <location-of-ifw>\installerbase.exe -p <package_directory> -c <config_directory>\<config_file> -e <packages> <installer_name>
\endcode
- \li On Linux and Mac OS X
+ \li On Linux and OS X
\code
<location-of-ifw>/binarycreator -t <location-of-ifw>/installerbase -p <package_directory> -c <config_directory>/<config_file> -e <packages> <installer_name>
@@ -715,7 +715,7 @@
\section2 Using Icons
- On Mac OS X, if the target binary is suffixed with .app, a Mac OS X
+ On OS X, if the target binary is suffixed with .app, a OS X
application bundle is created. The icon that you specify in config.xml is
extended with .icns and used as the icon for the created bundle.