diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
| commit | 516492370b95e9c07cad4080ef713d5b2b3f2f94 (patch) | |
| tree | c094d82a3cebf3aaff4182ae7824c3efbce6d3a3 /examples/doc/systeminfo.qdoc | |
| parent | 3b310a3ec13a743ae2258bc43d92a5df42c6ad37 (diff) | |
| parent | 8f7af86198935849c74c71add7c9ca081347fb85 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
Diffstat (limited to 'examples/doc/systeminfo.qdoc')
| -rw-r--r-- | examples/doc/systeminfo.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
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 /\}/ |