From c7066c9dc25bc4cafdd7bd8057ce34457a86ee65 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 7 Aug 2019 14:51:12 +0300 Subject: Update usage of Apple-related terminology Replace deprecated Q_OS_OSX macro used in several places with the newer Q_OS_MACOS. Old style reference of Apple's desktop operating system name as "OS X" in documentation and files are also replaced with "macOS" where applicable. Task-number: QTIFW-1406 Change-Id: I0561d5e0d964917ac4fca0702d58a06b85d30e57 Reviewed-by: Katja Marttila --- examples/doc/dynamicpage.qdoc | 2 +- examples/doc/online.qdoc | 6 +++--- examples/doc/openreadme.qdoc | 2 +- examples/doc/systeminfo.qdoc | 6 +++--- examples/systeminfo/packages/root/meta/installscript.qs | 2 +- examples/translations/README | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/doc/dynamicpage.qdoc b/examples/doc/dynamicpage.qdoc index 3dbc0d287..acbf9639c 100644 --- a/examples/doc/dynamicpage.qdoc +++ b/examples/doc/dynamicpage.qdoc @@ -105,7 +105,7 @@ \code ..\..\bin\binarycreator.exe -c config\config.xml -r resources/additional.qrc -p packages installer.exe \endcode - \li On Linux or OS X: + \li On Linux or macOS: \code ../../bin/binarycreator -c config/config.xml -r resources/additional.qrc -p packages installer \endcode diff --git a/examples/doc/online.qdoc b/examples/doc/online.qdoc index b64a2d6ee..90be15551 100644 --- a/examples/doc/online.qdoc +++ b/examples/doc/online.qdoc @@ -74,7 +74,7 @@ \code ..\..\bin\repogen.exe -p packages repository \endcode - \li On Linux or OS X: + \li On Linux or macOS: \code ../../bin/repogen -p packages repository \endcode @@ -114,7 +114,7 @@ \code ..\..\bin\binarycreator.exe --online-only -c config\config.xml -p packages installer.exe \endcode - \li On Linux or OS X: + \li On Linux or macOS: \code ../../bin/binarycreator --online-only -c config/config.xml -p packages installer \endcode @@ -139,7 +139,7 @@ \code ..\..\bin\repogen.exe --update-new-components -p packages_update repository \endcode - \li On Linux or OS X: + \li On Linux or macOS: \code ../../bin/repogen --update-new-components -p packages_update repository \endcode diff --git a/examples/doc/openreadme.qdoc b/examples/doc/openreadme.qdoc index 97e9a0422..86a6e3182 100644 --- a/examples/doc/openreadme.qdoc +++ b/examples/doc/openreadme.qdoc @@ -61,7 +61,7 @@ In installscript.qs, we use the \c Component() function to connect to the \c installationFinishedPageIsShown signal when the installation is complete and to the \c installationFinished signal when the end users click - \uicontrol Finish (\uicontrol Done on OS X): + \uicontrol Finish (\uicontrol Done on macOS): \quotefromfile openreadme/packages/or.qtproject.ifw.example.openreadme/meta/installscript.qs \skipto Component() diff --git a/examples/doc/systeminfo.qdoc b/examples/doc/systeminfo.qdoc index 027587af1..11a2573c5 100644 --- a/examples/doc/systeminfo.qdoc +++ b/examples/doc/systeminfo.qdoc @@ -84,9 +84,9 @@ \printto /\!validOs/ The script uses \l{systemInfo::productType}{systemInfo.productType} to differentiate - between Windows, OS X, and individual Linux distributions. + between Windows, macOS, and individual Linux distributions. - For OS X and Windows, the script checks the operating system kernel version. + For macOS and Windows, the script checks the operating system kernel version. For a mapping of kernel to operating system versions, see \l{http://en.wikipedia.org/wiki/Darwin_%28operating_system%29}{Darwin} and \l{http://en.wikipedia.org/wiki/Windows_NT}{Windows NT}. @@ -95,7 +95,7 @@ the specific distribution and version the binaries are presumably built for, the installer shows a warning in a modal dialog, but allows installation. - If the Windows or OS X version is too old, though, the script calls the \c cancelInstaller() + If the Windows or macOS version is too old, though, the script calls the \c cancelInstaller() helper function to prevent an actual installation: \printuntil /\}/ diff --git a/examples/systeminfo/packages/root/meta/installscript.qs b/examples/systeminfo/packages/root/meta/installscript.qs index 0b77b2f12..f5435b652 100644 --- a/examples/systeminfo/packages/root/meta/installscript.qs +++ b/examples/systeminfo/packages/root/meta/installscript.qs @@ -55,7 +55,7 @@ function Component() // // Check whether OS is supported. // - // For Windows and OS X we check the kernel version: + // For Windows and macOS we check the kernel version: // - Require at least Windows Vista (winnt kernel version 6.0.x) // - Require at least OS X 10.7 (Lion) (darwin kernel version 11.x) // diff --git a/examples/translations/README b/examples/translations/README index b3c20e3d7..a077fe2cb 100644 --- a/examples/translations/README +++ b/examples/translations/README @@ -12,4 +12,4 @@ Linux: LANGUAGE=de ./installer -On OS X and Windows you need to adapt the system settings to set German as preferred language, and then start the installer. +On macOS and Windows you need to adapt the system settings to set German as preferred language, and then start the installer. -- cgit v1.2.3