diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/threads/doc/src/semaphores.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/desktop/systray/doc/src/systray.qdoc | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/dropsite.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/application.qdoc | 6 | ||||
| -rw-r--r-- | examples/widgets/doc/src/classwizard.qdoc | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/src/licensewizard.qdoc | 4 | ||||
| -rw-r--r-- | examples/widgets/doc/src/plugandpaint.qdoc | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/examples/corelib/threads/doc/src/semaphores.qdoc b/examples/corelib/threads/doc/src/semaphores.qdoc index b1a1fc1ed2..ccbfcdb6e2 100644 --- a/examples/corelib/threads/doc/src/semaphores.qdoc +++ b/examples/corelib/threads/doc/src/semaphores.qdoc @@ -129,7 +129,7 @@ \c{freeBytes.available()} is \c BufferSize - 1 and \c{usedBytes.available()} is 1. At that point, two things can happen: Either the consumer thread takes over and reads that - byte, or the consumer gets to produce a second byte. + byte, or the producer thread gets to produce a second byte. The producer-consumer model presented in this example makes it possible to write highly concurrent multithreaded applications. diff --git a/examples/widgets/desktop/systray/doc/src/systray.qdoc b/examples/widgets/desktop/systray/doc/src/systray.qdoc index aa70561638..b89fed72e0 100644 --- a/examples/widgets/desktop/systray/doc/src/systray.qdoc +++ b/examples/widgets/desktop/systray/doc/src/systray.qdoc @@ -137,7 +137,7 @@ to show the message with the title, body, and icon for the time specified in milliseconds. - OS X users note: The Growl notification system must be + \macos users note: The Growl notification system must be installed for QSystemTrayIcon::showMessage() to display messages. QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::} @@ -172,7 +172,7 @@ We have reimplemented the QWidget::closeEvent() event handler to receive widget close events, showing the above message to the - users when they are closing the editor window. On OS X we need to + users when they are closing the editor window. On \macos we need to avoid showing the message and accepting the close event when the user really intends to quit the application, that is, when the user has triggered "Quit" in the menu bar or pressed the Command+Q diff --git a/examples/widgets/doc/dropsite.qdoc b/examples/widgets/doc/dropsite.qdoc index ee350717e2..32bcfe8916 100644 --- a/examples/widgets/doc/dropsite.qdoc +++ b/examples/widgets/doc/dropsite.qdoc @@ -222,7 +222,7 @@ and Qt::AlignLeft. A QString object, \c text, is customized to display data according to the - contents of \c format. We invoke {QString}'s \l{QString::simplified()} + contents of \c format. We invoke \l{QString}'s \l{QString::simplified()} {simplified()} function on \c text, to obtain a string that has no additional space before, after or in between words. diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc index ba45ec4e16..040aa171b7 100644 --- a/examples/widgets/doc/src/application.qdoc +++ b/examples/widgets/doc/src/application.qdoc @@ -234,7 +234,7 @@ Just before we create the \uicontrol{Help} menu, we call QMenuBar::addSeparator(). This has no effect for most widget - styles (e.g., Windows and OS X styles), but for some + styles (e.g., Windows and \macos styles), but for some styles this makes sure that \uicontrol{Help} is pushed to the right side of the menu bar. @@ -253,7 +253,7 @@ load the user's preferences and other application settings. The QSettings class provides a high-level interface for storing settings permanently on disk. On Windows, it uses the (in)famous - Windows registry; on OS X, it uses the native XML-based + Windows registry; on \macos, it uses the native XML-based CFPreferences API; on Unix/X11, it uses text files. The QSettings constructor takes arguments that identify your @@ -305,7 +305,7 @@ We start by opening the file in read-only mode. The QFile::Text flag indicates that the file is a text file, not a binary file. - On Unix and OS X, this makes no difference, but on Windows, + On Unix and \macos, this makes no difference, but on Windows, it ensures that the "\\r\\n" end-of-line sequence is converted to "\\n" when reading. diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc index 9391e0e133..6977cf5efa 100644 --- a/examples/widgets/doc/src/classwizard.qdoc +++ b/examples/widgets/doc/src/classwizard.qdoc @@ -76,7 +76,7 @@ \endlist Although the program is just an example, if you press \uicontrol Finish - (\uicontrol Done on OS X), actual C++ source files will actually be + (\uicontrol Done on \macos), actual C++ source files will actually be generated. \section1 The ClassWizard Class @@ -158,7 +158,7 @@ layouts. The \c className field is created with an asterisk (\c *) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that is, a field that must be filled before the user can press the - \uicontrol Next button (\uicontrol Continue on OS X). The fields' values + \uicontrol Next button (\uicontrol Continue on \macos). The fields' values can be accessed from any other page using QWizardPage::field(), or from the wizard code using QWizard::field(). diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc index 6f89be5698..30f1a876d2 100644 --- a/examples/widgets/doc/src/licensewizard.qdoc +++ b/examples/widgets/doc/src/licensewizard.qdoc @@ -94,7 +94,7 @@ \snippet dialogs/licensewizard/licensewizard.cpp 4 We set the style to \l{QWizard::}{ModernStyle} on all platforms - except OS X, + except \macos, \snippet dialogs/licensewizard/licensewizard.cpp 5 \snippet dialogs/licensewizard/licensewizard.cpp 6 @@ -160,7 +160,7 @@ layouts. The fields are created with an asterisk (\c *) next to their name. This makes them \l{mandatory fields}, that is, fields that must be filled before the user can press the - \uicontrol Next button (\uicontrol Continue on OS X). The fields' values + \uicontrol Next button (\uicontrol Continue on \macos). The fields' values can be accessed from any other page using QWizardPage::field(). Resetting the page amounts to clearing the two text fields. diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc index 5495ae8097..d3044860ab 100644 --- a/examples/widgets/doc/src/plugandpaint.qdoc +++ b/examples/widgets/doc/src/plugandpaint.qdoc @@ -162,7 +162,7 @@ subdirectory of the Plug & Paint example. On Unix, this is just a matter of initializing the QDir variable with QApplication::applicationDirPath(), the path of the executable - file, and to do a \l{QDir::cd()}{cd()}. On Windows and OS X, + file, and to do a \l{QDir::cd()}{cd()}. On Windows and \macos, this file is usually located in a subdirectory, so we need to take this into account. |