diff options
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 6 | ||||
| -rw-r--r-- | doc/installerfw-overview.qdoc | 2 | ||||
| -rw-r--r-- | doc/installerfw-using.qdoc | 2 | ||||
| -rw-r--r-- | doc/installerfw.qdoc | 12 | ||||
| -rw-r--r-- | doc/scripting.qdoc | 2 | ||||
| -rw-r--r-- | doc/tutorial.qdoc | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 4d7ff2ab1..eb5d51d5d 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -49,7 +49,7 @@ \list \li Microsoft Windows XP, and later \li Ubuntu Linux 8.04, and later - \li Mac OS X 10.6, and later + \li OS X 10.6, and later \endlist \section1 Building from Sources @@ -90,10 +90,10 @@ configure -prefix %CD%\qtbase -release -static -target xp -no-opengl -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtlocation -skip qtscript -skip qtsensors \endcode - \section3 Configuring Qt for Linux and Mac OS X + \section3 Configuring Qt for Linux and OS X We recommend that you use the following configuration options for Linux and - Mac OS X: + OS X: \code ./configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-opengl -nomake examples -nomake tests -developer-build -skip qtquick1 -skip qtscript -skip qtlocation diff --git a/doc/installerfw-overview.qdoc b/doc/installerfw-overview.qdoc index a18ca8c6c..7f28248a1 100644 --- a/doc/installerfw-overview.qdoc +++ b/doc/installerfw-overview.qdoc @@ -37,7 +37,7 @@ create installers once, and deploy them across all the supported desktop Qt platforms without rewriting the source code. The installers will have the native look and feel on the platform where they are run: Linux, Microsoft - Windows, and Mac OS X. + Windows, and OS X. The Qt Installer Framework tools generate installers with a set of pages that guide the users during the installation, update, or uninstallation diff --git a/doc/installerfw-using.qdoc b/doc/installerfw-using.qdoc index 3308f71c0..ee6021f34 100644 --- a/doc/installerfw-using.qdoc +++ b/doc/installerfw-using.qdoc @@ -70,7 +70,7 @@ This section uses the \e {Your Application Installer} example run on Windows to illustrate the default workflow for end users. The installers have the native look and feel on each supported desktop platform, and therefore they - look and feel different when run on Linux and Mac OS X. + look and feel different when run on Linux and OS X. The example files are stored in the \c{examples\tutorial} directory in the Qt Installer Framework repository. You can use the \c binarycreator 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. diff --git a/doc/scripting.qdoc b/doc/scripting.qdoc index 880c1ef88..b7420d806 100644 --- a/doc/scripting.qdoc +++ b/doc/scripting.qdoc @@ -257,7 +257,7 @@ \row \li ApplicationsDir \li Applications directory. For example, \c {C:\Program Files} on Windows, - \c {/opt} on Linux and \c {/Applications} on Mac OS X. + \c {/opt} on Linux and \c {/Applications} on OS X. \row \li InstallerDirPath \li The directory that contains the installer application executable. diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc index 0ef0a86d8..9e77ae991 100644 --- a/doc/tutorial.qdoc +++ b/doc/tutorial.qdoc @@ -181,7 +181,7 @@ ..\..\bin\binarycreator.exe -c config\config.xml -p packages YourInstaller.exe \endcode - \li On Linux or Mac OS X: + \li On Linux or OS X: \code ../../bin/binarycreator -c config/config.xml -p packages YourInstaller \endcode |