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/systeminfo.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/doc/systeminfo.qdoc') 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 /\}/ -- cgit v1.2.3