diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-08-07 14:51:12 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2019-08-16 08:35:19 +0000 |
| commit | c7066c9dc25bc4cafdd7bd8057ce34457a86ee65 (patch) | |
| tree | 03a2f790af380528cd54415b5bf29bb495df972c /doc/scripting-api | |
| parent | 54f1de217b774322f383df446844c3ec3422dee2 (diff) | |
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 <katja.marttila@qt.io>
Diffstat (limited to 'doc/scripting-api')
| -rw-r--r-- | doc/scripting-api/buttons.qdoc | 6 | ||||
| -rw-r--r-- | doc/scripting-api/qfiledialog.qdoc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/scripting-api/buttons.qdoc b/doc/scripting-api/buttons.qdoc index a96d68434..811bde587 100644 --- a/doc/scripting-api/buttons.qdoc +++ b/doc/scripting-api/buttons.qdoc @@ -42,13 +42,13 @@ Specifies the buttons on an installer page. \value buttons.BackButton - The \uicontrol Back button (\uicontrol {Go Back} on OS X.) + The \uicontrol Back button (\uicontrol {Go Back} on macOS.) \value buttons.NextButton - The \uicontrol Next button (\uicontrol Continue on OS X.) + The \uicontrol Next button (\uicontrol Continue on macOS.) \value buttons.CommitButton The \uicontrol Commit button. \value buttons.FinishButton - The \uicontrol Finish button (\uicontrol Done on OS X.) + The \uicontrol Finish button (\uicontrol Done on macOS.) \value buttons.CancelButton The \uicontrol Cancel button. \value buttons.HelpButton diff --git a/doc/scripting-api/qfiledialog.qdoc b/doc/scripting-api/qfiledialog.qdoc index ecce6f59d..5433697ce 100644 --- a/doc/scripting-api/qfiledialog.qdoc +++ b/doc/scripting-api/qfiledialog.qdoc @@ -66,6 +66,6 @@ "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" \endcode - On Windows, and OS X, this static function will use the native file dialog + On Windows, and macOS, this static function will use the native file dialog and not a QFileDialog. */ |