summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-08-03 12:00:41 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-12 08:30:29 +0000
commita2ae631c04fee752e492f2c0b8fd25f06abffd6b (patch)
treec23b323762193b93334aba8bc000687f156c0719 /src/widgets
parentc38ac3dab8cbbdb494e09ccebe93c4e57a9987c3 (diff)
Doc: Change instances of '(Mac) OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change the occurrences where the Mac platform is discussed to use a macro \macos, which expands to 'macOS'. This helps with adapting to future renaming. Update the instructions on mac-specific Q_OS_* macro usage. Add a \target for the old 'Qt for OS X' topic to keep links working for other documentation modules that try to link with the old name. Change-Id: Id33fb0cd985df702a4ae4efb4c5fd428e77d9b85 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp8
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp10
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp18
-rw-r--r--src/widgets/dialogs/qwizard.cpp20
-rw-r--r--src/widgets/doc/src/graphicsview.qdoc2
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/focus.qdoc4
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/styles.qdoc2
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc8
-rw-r--r--src/widgets/doc/src/widgets-tutorial.qdoc2
-rw-r--r--src/widgets/graphicsview/qgraphicssceneevent.cpp2
-rw-r--r--src/widgets/kernel/qaction.cpp10
-rw-r--r--src/widgets/kernel/qapplication.cpp4
-rw-r--r--src/widgets/kernel/qdesktopwidget.qdoc2
-rw-r--r--src/widgets/kernel/qformlayout.cpp4
-rw-r--r--src/widgets/kernel/qopenglwidget.cpp4
-rw-r--r--src/widgets/kernel/qsizepolicy.cpp2
-rw-r--r--src/widgets/kernel/qwidget.cpp18
-rw-r--r--src/widgets/kernel/qwidgetaction.cpp6
-rw-r--r--src/widgets/styles/qmacstyle.qdoc12
-rw-r--r--src/widgets/styles/qmacstyle_mac.mm2
-rw-r--r--src/widgets/styles/qstyle.cpp6
-rw-r--r--src/widgets/styles/qstyleoption.cpp2
-rw-r--r--src/widgets/util/qscroller.cpp2
-rw-r--r--src/widgets/util/qsystemtrayicon.cpp10
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp4
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.mm6
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.mm4
-rw-r--r--src/widgets/widgets/qmainwindow.cpp2
-rw-r--r--src/widgets/widgets/qmenu.cpp2
-rw-r--r--src/widgets/widgets/qmenu_mac.mm8
-rw-r--r--src/widgets/widgets/qmenubar.cpp14
-rw-r--r--src/widgets/widgets/qrubberband.cpp2
-rw-r--r--src/widgets/widgets/qtabbar.cpp2
-rw-r--r--src/widgets/widgets/qtabwidget.cpp2
-rw-r--r--src/widgets/widgets/qtoolbutton.cpp2
35 files changed, 104 insertions, 104 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 6a1135920d..547a55f19e 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -535,8 +535,8 @@ QColor QColorDialog::customColor(int index)
/*!
Sets the custom color at \a index to the QColor \a color value.
- \note This function does not apply to the Native Color Dialog on the Mac
- OS X platform. If you still require this function, use the
+ \note This function does not apply to the Native Color Dialog on the
+ \macos platform. If you still require this function, use the
QColorDialog::DontUseNativeDialog option.
*/
void QColorDialog::setCustomColor(int index, QColor color)
@@ -557,8 +557,8 @@ QColor QColorDialog::standardColor(int index)
/*!
Sets the standard color at \a index to the QColor \a color value.
- \note This function does not apply to the Native Color Dialog on the Mac
- OS X platform. If you still require this function, use the
+ \note This function does not apply to the Native Color Dialog on the
+ \macos platform. If you still require this function, use the
QColorDialog::DontUseNativeDialog option.
*/
void QColorDialog::setStandardColor(int index, QColor color)
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 7d34b6de4a..bc2de899f5 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2076,7 +2076,7 @@ QString QFileDialog::labelText(DialogLabel label) const
The dialog's caption is set to \a caption. If \a caption is not specified
then a default caption will be used.
- On Windows, and OS X, this static function will use the
+ On Windows, and \macos, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
@@ -2187,7 +2187,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
The dialog's caption is set to \a caption. If \a caption is not specified
then a default caption will be used.
- On Windows, and OS X, this static function will use the
+ On Windows, and \macos, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
@@ -2310,12 +2310,12 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent,
The dialog's caption is set to \a caption. If \a caption is not specified,
a default caption will be used.
- On Windows, and OS X, this static function will use the
+ On Windows, and \macos, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
dispatch any QTimers, and if \a parent is not 0 then it will position the
- dialog just below the parent's title bar. On OS X, with its native file
+ dialog just below the parent's title bar. On \macos, with its native file
dialog, the filter argument is ignored.
On Unix/X11, the normal behavior of the file dialog is to resolve and
@@ -2418,7 +2418,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must
be set.
- On Windows and OS X, this static function will use the
+ On Windows and \macos, this static function will use the
native file dialog and not a QFileDialog. However, the native Windows file
dialog does not support displaying files in the directory chooser. You need
to pass \l{QFileDialog::}{DontUseNativeDialog} to display files using a
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index f32f7b0417..61a890c064 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -580,7 +580,7 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button
This is the approach recommended in the
\l{http://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/20000961-BABCAJID}
- {OS X Guidelines}. Similar guidelines apply for the other
+ {\macos Guidelines}. Similar guidelines apply for the other
platforms, but note the different ways the
\l{QMessageBox::informativeText} {informative text} is handled for
different platforms.
@@ -795,7 +795,7 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button
Constructs a message box with no text and no buttons. \a parent is
passed to the QDialog constructor.
- On OS X, if you want your message box to appear
+ On \macos, if you want your message box to appear
as a Qt::Sheet of its \a parent, set the message box's
\l{setWindowModality()} {window modality} to Qt::WindowModal or use open().
Otherwise, the message box will be a standard dialog.
@@ -817,7 +817,7 @@ QMessageBox::QMessageBox(QWidget *parent)
The message box is an \l{Qt::ApplicationModal} {application modal}
dialog box.
- On OS X, if \a parent is not 0 and you want your message box
+ On \macos, if \a parent is not 0 and you want your message box
to appear as a Qt::Sheet of that parent, set the message box's
\l{setWindowModality()} {window modality} to Qt::WindowModal
(default). Otherwise, the message box will be a standard dialog.
@@ -985,7 +985,7 @@ QAbstractButton *QMessageBox::button(StandardButton which) const
\list 1
\li If there is only one button, it is made the escape button.
\li If there is a \l Cancel button, it is made the escape button.
- \li On OS X only, if there is exactly one button with the role
+ \li On \macos only, if there is exactly one button with the role
QMessageBox::RejectRole, it is made the escape button.
\endlist
@@ -1800,7 +1800,7 @@ QMessageBox::StandardButton QMessageBox::critical(QWidget *parent, const QString
\li As a last resort it uses the Information icon.
\endlist
- The about box has a single button labelled "OK". On OS X, the
+ The about box has a single button labelled "OK". On \macos, the
about box is popped up as a modeless window; on other platforms,
it is currently application modal.
@@ -1854,7 +1854,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
QApplication provides this functionality as a slot.
- On OS X, the about box is popped up as a modeless window; on
+ On \macos, the about box is popped up as a modeless window; on
other platforms, it is currently application modal.
\sa QApplication::aboutQt()
@@ -2619,8 +2619,8 @@ void QMessageBox::setInformativeText(const QString &text)
This function shadows QWidget::setWindowTitle().
- Sets the title of the message box to \a title. On OS X,
- the window title is ignored (as required by the OS X
+ Sets the title of the message box to \a title. On \macos,
+ the window title is ignored (as required by the \macos
Guidelines).
*/
void QMessageBox::setWindowTitle(const QString &title)
@@ -2641,7 +2641,7 @@ void QMessageBox::setWindowTitle(const QString &title)
Sets the modality of the message box to \a windowModality.
- On OS X, if the modality is set to Qt::WindowModal and the message box
+ On \macos, if the modality is set to Qt::WindowModal and the message box
has a parent, then the message box will be a Qt::Sheet, otherwise the
message box will be a standard dialog.
*/
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index b9906f13da..219cfb62b1 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1817,7 +1817,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\inmodule QtWidgets
- A wizard (also called an assistant on OS X) is a special type
+ A wizard (also called an assistant on \macos) is a special type
of input dialog that consists of a sequence of pages. A wizard's
purpose is to guide the user through a process step by step.
Wizards are useful for complex or infrequent tasks that users may
@@ -2115,10 +2115,10 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
This enum specifies the buttons in a wizard.
- \value BackButton The \uicontrol Back button (\uicontrol {Go Back} on OS X)
- \value NextButton The \uicontrol Next button (\uicontrol Continue on OS X)
+ \value BackButton The \uicontrol Back button (\uicontrol {Go Back} on \macos)
+ \value NextButton The \uicontrol Next button (\uicontrol Continue on \macos)
\value CommitButton The \uicontrol Commit button
- \value FinishButton The \uicontrol Finish button (\uicontrol Done on OS X)
+ \value FinishButton The \uicontrol Finish button (\uicontrol Done on \macos)
\value CancelButton The \uicontrol Cancel button (see also NoCancelButton)
\value HelpButton The \uicontrol Help button (see also HaveHelpButton)
\value CustomButton1 The first user-defined button (see also HaveCustomButton1)
@@ -2158,7 +2158,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\value ClassicStyle Classic Windows look
\value ModernStyle Modern Windows look
- \value MacStyle OS X look
+ \value MacStyle \macos look
\value AeroStyle Windows Aero look
\omitvalue NStyles
@@ -2631,7 +2631,7 @@ bool QWizard::testOption(WizardOption option) const
\list
\li Windows: HelpButtonOnRight.
- \li OS X: NoDefaultButton and NoCancelButton.
+ \li \macos: NoDefaultButton and NoCancelButton.
\li X11 and QWS (Qt for Embedded Linux): none.
\endlist
@@ -2675,7 +2675,7 @@ QWizard::WizardOptions QWizard::options() const
Sets the text on button \a which to be \a text.
By default, the text on buttons depends on the wizardStyle. For
- example, on OS X, the \uicontrol Next button is called \uicontrol
+ example, on \macos, the \uicontrol Next button is called \uicontrol
Continue.
To add extra buttons to the wizard (e.g., a \uicontrol Print button),
@@ -2707,7 +2707,7 @@ void QWizard::setButtonText(WizardButton which, const QString &text)
If a text has ben set using setButtonText(), this text is returned.
By default, the text on buttons depends on the wizardStyle. For
- example, on OS X, the \uicontrol Next button is called \uicontrol
+ example, on \macos, the \uicontrol Next button is called \uicontrol
Continue.
\sa button(), setButton(), setButtonText(), QWizardPage::buttonText(),
@@ -2893,7 +2893,7 @@ void QWizard::setPixmap(WizardPixmap which, const QPixmap &pixmap)
Returns the pixmap set for role \a which.
By default, the only pixmap that is set is the BackgroundPixmap on
- OS X.
+ \macos.
\sa QWizardPage::pixmap(), {Elements of a Wizard Page}
*/
@@ -3805,7 +3805,7 @@ void QWizardPage::setButtonText(QWizard::WizardButton which, const QString &text
this text is returned.
By default, the text on buttons depends on the QWizard::wizardStyle.
- For example, on OS X, the \uicontrol Next button is called \uicontrol
+ For example, on \macos, the \uicontrol Next button is called \uicontrol
Continue.
\sa setButtonText(), QWizard::buttonText(), QWizard::setButtonText()
diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 6f3bc68f98..8848e43f29 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -491,7 +491,7 @@
not supported. For example, you can create decorated windows by
passing the Qt::Window window flag to QGraphicsWidget's constructor,
but Graphics View currently doesn't support the Qt::Sheet and
- Qt::Drawer flags that are common on OS X.
+ Qt::Drawer flags that are common on \macos.
\section3 QGraphicsLayout
diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index d7a2361dda..52f8c12732 100644
--- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -162,13 +162,13 @@
\section2 The User Rotates the Mouse Wheel
On Microsoft Windows, mouse wheel usage is always handled by the
- widget that has keyboard focus. On OS X and X11, it's handled by
+ widget that has keyboard focus. On \macos and X11, it's handled by
the widget that gets other mouse events.
The way Qt handles this platform difference is by letting widgets move
the keyboard focus when the wheel is used. With the right focus policy
on each widget, applications can work idiomatically correctly on
- Windows, OS X, and X11.
+ Windows, \macos, and X11.
\section2 The User Moves the Focus to This Window
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index 7d1bffd0b4..0165d2d5e4 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -115,7 +115,7 @@
The widget is passed as the last argument in case the style needs
it to perform special effects (such as animated default buttons on
- OS X), but it isn't mandatory.
+ \macos), but it isn't mandatory.
In the course of this section, we will look at the style elements,
the style options, and the functions of QStyle. Finally, we describe
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 2fb6819c47..606fe5ce15 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -80,7 +80,7 @@
the QPalette::Button role to red for a QPushButton to obtain a
red push button. However, this wasn't guaranteed to work for all
styles, because style authors are restricted by the different
- platforms' guidelines and (on Windows XP and OS X) by the
+ platforms' guidelines and (on Windows XP and \macos) by the
native theme engine.
Style sheets let you perform all kinds of customizations that are
@@ -121,7 +121,7 @@
\row \li \inlineimage stylesheet-coffee-cleanlooks.png
\li \inlineimage stylesheet-pagefold-mac.png
\row \li Coffee theme running on Ubuntu Linux
- \li Pagefold theme running on OS X
+ \li Pagefold theme running on \macos
\endtable
When a style sheet is active, the QStyle returned by QWidget::style()
@@ -130,7 +130,7 @@
otherwise forwards the drawing operations to the underlying,
platform-specific style (e.g., QWindowsXPStyle on Windows XP).
- Since Qt 4.5, Qt style sheets fully supports OS X.
+ Since Qt 4.5, Qt style sheets fully supports \macos.
*/
@@ -3793,7 +3793,7 @@
\snippet code/doc_src_stylesheet.qdoc 135
If you want the scroll buttons of the scroll bar to be placed together
- (instead of the edges) like on OS X, you can use the following
+ (instead of the edges) like on \macos, you can use the following
stylesheet:
\snippet code/doc_src_stylesheet.qdoc 136
diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc
index a337a7a487..77d85e63d8 100644
--- a/src/widgets/doc/src/widgets-tutorial.qdoc
+++ b/src/widgets/doc/src/widgets-tutorial.qdoc
@@ -110,7 +110,7 @@
make sure that the executable is on your path, or enter its
full location.
- \li On Linux/Unix and OS X, type \c make and press
+ \li On Linux/Unix and \macos, type \c make and press
\uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
press \uicontrol{Return}.
diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp
index 071d34280a..07842de00c 100644
--- a/src/widgets/graphicsview/qgraphicssceneevent.cpp
+++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp
@@ -143,7 +143,7 @@
platforms, this means the right mouse button was clicked.
\value Keyboard The keyboard caused this event to be sent. On
- Windows and OS X, this means the menu button was pressed.
+ Windows and \macos, this means the menu button was pressed.
\value Other The event was sent by some other means (i.e. not
by the mouse or keyboard).
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index 1ef9e4ef98..2067e7dbcc 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -249,7 +249,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
/*!
\enum QAction::MenuRole
- This enum describes how an action should be moved into the application menu on OS X.
+ This enum describes how an action should be moved into the application menu on \macos.
\value NoRole This action should not be put into the application menu
\value TextHeuristicRole This action should be put in the application menu based on the action's text
@@ -258,7 +258,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
\value AboutQtRole This action handles the "About Qt" menu item.
\value AboutRole This action should be placed where the "About" menu item is in the application menu. The text of
the menu item will be set to "About <application name>". The application name is fetched from the
- \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}).
+ \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - Deployment}).
\value PreferencesRole This action should be placed where the "Preferences..." menu item is in the application menu.
\value QuitRole This action should be placed where the Quit menu item is in the application menu.
@@ -1230,12 +1230,12 @@ void QAction::activate(ActionEvent event)
\brief the action's menu role
\since 4.2
- This indicates what role the action serves in the application menu on Mac
- OS X. By default all actions have the TextHeuristicRole, which means that
+ This indicates what role the action serves in the application menu on
+ \macos. By default all actions have the TextHeuristicRole, which means that
the action is added based on its text (see QMenuBar for more information).
The menu role can only be changed before the actions are put into the menu
- bar in OS X (usually just before the first application window is
+ bar in \macos (usually just before the first application window is
shown).
*/
void QAction::setMenuRole(MenuRole menuRole)
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index fcc195f601..917273e8cf 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1530,7 +1530,7 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
\note Some styles do not use the palette for all drawing, for instance, if
they make use of native theme engines. This is the case for the Windows XP,
- Windows Vista, and OS X styles.
+ Windows Vista, and \macos styles.
\sa QWidget::setPalette(), palette(), QStyle::polish()
*/
@@ -4021,7 +4021,7 @@ bool QApplication::keypadNavigationEnabled()
Currently this function does nothing on Qt for Embedded Linux.
- On OS X, this works more at the application level and will cause the
+ On \macos, this works more at the application level and will cause the
application icon to bounce in the dock.
On Windows, this causes the window's taskbar entry to flash for a time. If
diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc
index abdbd35f5b..00a01bb572 100644
--- a/src/widgets/kernel/qdesktopwidget.qdoc
+++ b/src/widgets/kernel/qdesktopwidget.qdoc
@@ -149,7 +149,7 @@
Returns the available geometry of the screen with index \a screen. What
is available will be subrect of screenGeometry() based on what the
platform decides is available (for example excludes the dock and menu bar
- on OS X, or the task bar on Windows). The default screen is used if
+ on \macos, or the task bar on Windows). The default screen is used if
\a screen is -1.
\sa screenNumber(), screenGeometry()
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 124f6b301c..24bf80f16c 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1041,7 +1041,7 @@ QLayoutItem* QFormLayoutPrivate::replaceAt(int index, QLayoutItem *newitem)
\li \b{Adherence to the different platform's look and feel guidelines.}
For example, the
- \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{Mac OS X Aqua} and KDE guidelines specify that the
+ \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos Aqua} and KDE guidelines specify that the
labels should be right-aligned, whereas Windows and GNOME
applications normally use left-alignment.
@@ -1084,7 +1084,7 @@ QLayoutItem* QFormLayoutPrivate::replaceAt(int index, QLayoutItem *newitem)
corresponds to what we would get using a two-column
QGridLayout.)
\li Style based on the
- \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{Mac OS X Aqua} guidelines. Labels are right-aligned,
+ \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos Aqua} guidelines. Labels are right-aligned,
the fields don't grow beyond their size hint, and the
form is horizontally centered.
\li Recommended style for
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index 1d48be5198..c94c8bd1c6 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -106,7 +106,7 @@ QT_BEGIN_NAMESPACE
\note Calling QSurfaceFormat::setDefaultFormat() before constructing
the QApplication instance is mandatory on some platforms (for example,
- OS X) when an OpenGL core profile context is requested. This is to
+ \macos) when an OpenGL core profile context is requested. This is to
ensure that resource sharing between contexts stays functional as all
internal contexts are created using the correct version and profile.
@@ -461,7 +461,7 @@ QT_BEGIN_NAMESPACE
recommended to limit the usage of this approach to cases where there
is no other choice. Note that this option is not suitable for most
embedded and mobile platforms, and it is known to have issues on
- certain desktop platforms (e.g. OS X) too. The stable,
+ certain desktop platforms (e.g. \macos) too. The stable,
cross-platform solution is always QOpenGLWidget.
\e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
diff --git a/src/widgets/kernel/qsizepolicy.cpp b/src/widgets/kernel/qsizepolicy.cpp
index 26d1733d26..b1cdb52c55 100644
--- a/src/widgets/kernel/qsizepolicy.cpp
+++ b/src/widgets/kernel/qsizepolicy.cpp
@@ -241,7 +241,7 @@ QSizePolicy::ControlType QSizePolicy::controlType() const
The control type specifies the type of the widget for which this
size policy applies. It is used by some styles, notably
QMacStyle, to insert proper spacing between widgets. For example,
- the Mac OS X Aqua guidelines specify that push buttons should be
+ the \macos Aqua guidelines specify that push buttons should be
separated by 12 pixels, whereas vertically stacked radio buttons
only require 6 pixels.
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 57148eb811..03f642bd9b 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2505,7 +2505,7 @@ QWidget *QWidget::find(WId id)
If a widget is non-native (alien) and winId() is invoked on it, that widget
will be provided a native handle.
- On OS X, the type returned depends on which framework Qt was linked
+ On \macos, the type returned depends on which framework Qt was linked
against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt
is using Cocoa, {WId} is a pointer to an NSView.
@@ -2632,7 +2632,7 @@ QWindow *QWidget::windowHandle() const
The style sheet contains a textual description of customizations to the
widget's style, as described in the \l{Qt Style Sheets} document.
- Since Qt 4.5, Qt style sheets fully supports OS X.
+ Since Qt 4.5, Qt style sheets fully supports \macos.
\warning Qt style sheets are currently not supported for custom QStyle
subclasses. We plan to address this in some future release.
@@ -5111,7 +5111,7 @@ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset,
Transformations and settings applied to the \a painter will be used
when rendering.
- \note The \a painter must be active. On OS X the widget will be
+ \note The \a painter must be active. On \macos the widget will be
rendered into a QPixmap and then drawn by the \a painter.
\sa QPainter::device()
@@ -6255,7 +6255,7 @@ QString QWidget::windowIconText() const
If the window title is set at any point, then the window title takes precedence and
will be shown instead of the file path string.
- Additionally, on OS X, this has an added benefit that it sets the
+ Additionally, on \macos, this has an added benefit that it sets the
\l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/XHIGWindows/chapter_17_section_3.html}{proxy icon}
for the window, assuming that the file path exists.
@@ -11294,7 +11294,7 @@ bool QWidget::testAttribute_helper(Qt::WidgetAttribute attribute) const
By default the value of this property is 1.0.
- This feature is available on Embedded Linux, OS X, Windows,
+ This feature is available on Embedded Linux, \macos, Windows,
and X11 platforms that support the Composite extension.
This feature is not available on Windows CE.
@@ -11357,7 +11357,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
A modified window is a window whose content has changed but has
not been saved to disk. This flag will have different effects
- varied by the platform. On OS X the close button will have a
+ varied by the platform. On \macos the close button will have a
modified look; on other platforms, the window title will have an
'*' (asterisk).
@@ -12503,7 +12503,7 @@ static void releaseMouseGrabOfWidget(QWidget *widget)
\note On Windows, grabMouse() only works when the mouse is inside a window
owned by the process.
- On OS X, grabMouse() only works when the mouse is inside the frame of that widget.
+ On \macos, grabMouse() only works when the mouse is inside the frame of that widget.
\sa releaseMouse(), grabKeyboard(), releaseKeyboard()
*/
@@ -12975,7 +12975,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
This function will return 0 if no painter context can be established, or if the handle
could not be created.
- \warning This function is only available on OS X.
+ \warning This function is only available on \macos.
*/
/*! \fn Qt::HANDLE QWidget::macQDHandle() const
\internal
@@ -12984,7 +12984,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
This function will return 0 if QuickDraw is not supported, or if the handle could
not be created.
- \warning This function is only available on OS X.
+ \warning This function is only available on \macos.
*/
/*! \fn const QX11Info &QWidget::x11Info() const
\internal
diff --git a/src/widgets/kernel/qwidgetaction.cpp b/src/widgets/kernel/qwidgetaction.cpp
index 3c0c203fd6..a96ee62996 100644
--- a/src/widgets/kernel/qwidgetaction.cpp
+++ b/src/widgets/kernel/qwidgetaction.cpp
@@ -79,8 +79,8 @@ QT_BEGIN_NAMESPACE
Note that it is up to the widget to activate the action, for example by
reimplementing mouse event handlers and calling QAction::trigger().
- \b {OS X}: If you add a widget to a menu in the application's menu
- bar on OS X, the widget will be added and it will function but with some
+ \b {\macos}: If you add a widget to a menu in the application's menu
+ bar on \macos, the widget will be added and it will function but with some
limitations:
\list 1
\li The widget is reparented away from the QMenu to the native menu
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
\li Due to Apple's design, mouse tracking on the widget currently does
not work.
\li Connecting the triggered() signal to a slot that opens a modal
- dialog will cause a crash in Mac OS X 10.4 (known bug acknowledged
+ dialog will cause a crash in \macos 10.4 (known bug acknowledged
by Apple), a workaround is to use a QueuedConnection instead of a
DirectConnection.
\endlist
diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
index 0800e2d608..b796990074 100644
--- a/src/widgets/styles/qmacstyle.qdoc
+++ b/src/widgets/styles/qmacstyle.qdoc
@@ -28,7 +28,7 @@
/*!
\class QMacStyle
- \brief The QMacStyle class provides a OS X style using the Apple Appearance Manager.
+ \brief The QMacStyle class provides a \macos style using the Apple Appearance Manager.
\ingroup appearance
\inmodule QtWidgets
@@ -36,10 +36,10 @@
This class is implemented as a wrapper to the HITheme
APIs, allowing applications to be styled according to the current
- theme in use on OS X. This is done by having primitives
- in QStyle implemented in terms of what OS X would normally theme.
+ theme in use on \macos. This is done by having primitives
+ in QStyle implemented in terms of what \macos would normally theme.
- \warning This style is only available on OS X because it relies on the
+ \warning This style is only available on \macos because it relies on the
HITheme APIs.
There are additional issues that should be taken
@@ -56,7 +56,7 @@
involve horizontal and vertical widget alignment and widget size
(covered below).
- \li Widget size - OS X allows widgets to have specific fixed sizes. Qt
+ \li Widget size - \macos allows widgets to have specific fixed sizes. Qt
does not fully implement this behavior so as to maintain cross-platform
compatibility. As a result some widgets sizes may be inappropriate (and
subsequently not rendered correctly by the HITheme APIs).The
@@ -75,7 +75,7 @@
There are other issues that need to be considered in the feel of
your application (including the general color scheme to match the
Aqua colors). The Guidelines mentioned above will remain current
- with new advances and design suggestions for OS X.
+ with new advances and design suggestions for \macos.
Note that the functions provided by QMacStyle are
reimplementations of QStyle functions; see QStyle for their
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 52f6ca2131..8f724df857 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -7221,7 +7221,7 @@ static CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintD
returned if it can't be obtained. It is the caller's responsibility to
CGContextRelease the context when finished using it.
- \warning This function is only available on OS X.
+ \warning This function is only available on \macos.
\warning This function is duplicated in the Cocoa platform plugin.
*/
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 6a03d73c72..e148e5deec 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -98,7 +98,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
The style gets all the information it needs to render the
graphical element from the QStyleOption class. The widget is
passed as the last argument in case the style needs it to perform
- special effects (such as animated default buttons on OS X),
+ special effects (such as animated default buttons on \macos),
but it isn't mandatory. In fact, QStyle can be used to draw on any
paint device (not just widgets), in which case the widget argument
is a zero pointer.
@@ -197,7 +197,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
QStyle gets all the information it needs to render the graphical
element from QStyleOption. The widget is passed as the last
argument in case the style needs it to perform special effects
- (such as animated default buttons on OS X), but it isn't
+ (such as animated default buttons on \macos), but it isn't
mandatory. In fact, you can use QStyle to draw on any paint
device, not just widgets, by setting the QPainter properly.
@@ -1718,7 +1718,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
desktop platforms.
\value SH_Menu_SubMenuUniDirection Since Qt 5.5. If the cursor has
- to move towards the submenu (like it is on OS X), or if the
+ to move towards the submenu (like it is on \macos), or if the
cursor can move in any direction as long as it reaches the
submenu before the sloppy timeout.
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 28c0b41a15..7aa9a09731 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1744,7 +1744,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
\value DefaultItem A menu item that is the default action as specified with \l QMenu::defaultAction().
\value Separator A menu separator.
\value SubMenu Indicates the menu item points to a sub-menu.
- \value Scroller A popup menu scroller (currently only used on OS X).
+ \value Scroller A popup menu scroller (currently only used on \macos).
\value TearOff A tear-off handle for the menu.
\value Margin The margin of the menu.
\value EmptyArea The empty area of the menu.
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index 270f1c5890..2adcdd018d 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -558,7 +558,7 @@ void QScroller::stop()
\note Please note that this value should be physically correct. The actual DPI settings
that Qt returns for the display may be reported wrongly on purpose by the underlying
- windowing system, for example on OS X.
+ windowing system, for example on \macos.
*/
QPointF QScroller::pixelPerMeter() const
{
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 5589cda50a..704142fe5c 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -76,9 +76,9 @@ QT_BEGIN_NAMESPACE
\li All X11 desktop environments that implement the D-Bus
\l{http://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/StatusNotifierItem}
specification, including recent versions of KDE and Unity.
- \li All supported versions of OS X. Note that the Growl
+ \li All supported versions of \macos. Note that the Growl
notification system must be installed for
- QSystemTrayIcon::showMessage() to display messages on Mac OS X prior to 10.8 (Mountain Lion).
+ QSystemTrayIcon::showMessage() to display messages on \macos prior to 10.8 (Mountain Lion).
\endlist
To check whether a system tray is present on the user's desktop,
@@ -157,7 +157,7 @@ QSystemTrayIcon::~QSystemTrayIcon()
The menu will pop up when the user requests the context menu for the system
tray icon by clicking the mouse button.
- On OS X, this is currenly converted to a NSMenu, so the
+ On \macos, this is currenly converted to a NSMenu, so the
aboutToHide() signal is not emitted.
\note The system tray icon does not take ownership of the menu. You must
@@ -317,7 +317,7 @@ bool QSystemTrayIcon::event(QEvent *e)
This signal is emitted when the message displayed using showMessage()
was clicked by the user.
- Currently this signal is not sent on OS X.
+ Currently this signal is not sent on \macos.
\note We follow Microsoft Windows XP/Vista behavior, so the
signal is also emitted when the user clicks on a tray icon with
@@ -368,7 +368,7 @@ bool QSystemTrayIcon::supportsMessages()
On Windows, the \a millisecondsTimeoutHint is usually ignored by the system
when the application has focus.
- On OS X, the Growl notification system must be installed for this function to
+ On \macos, the Growl notification system must be installed for this function to
display messages.
Has been turned into a slot in Qt 5.2.
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 4d2c32d43e..1986344a8c 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -118,7 +118,7 @@ QT_BEGIN_NAMESPACE
\endtable
Additionally, button boxes that contain only buttons with ActionRole or
- HelpRole can be considered modeless and have an alternate look on OS X:
+ HelpRole can be considered modeless and have an alternate look on \macos:
\table
\row \li modeless horizontal MacLayout
@@ -583,7 +583,7 @@ QDialogButtonBox::~QDialogButtonBox()
contained in the button box.
\value WinLayout Use a policy appropriate for applications on Windows.
- \value MacLayout Use a policy appropriate for applications on OS X.
+ \value MacLayout Use a policy appropriate for applications on \macos.
\value KdeLayout Use a policy appropriate for applications on KDE.
\value GnomeLayout Use a policy appropriate for applications on GNOME.
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index a384e41d1b..cc45c101dc 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -43,7 +43,7 @@
\class QMacCocoaViewContainer
\since 4.5
- \brief The QMacCocoaViewContainer class provides a widget for OS X that can be used to wrap arbitrary
+ \brief The QMacCocoaViewContainer class provides a widget for \macos that can be used to wrap arbitrary
Cocoa views (i.e., NSView subclasses) and insert them into Qt hierarchies.
\ingroup advanced
@@ -58,10 +58,10 @@
of the underlying NSView.
QMacCocoaViewContainer works regardless if Qt is built against Carbon or
- Cocoa. However, QCocoaContainerView requires Mac OS X 10.5 or better to be
+ Cocoa. However, QCocoaContainerView requires \macos 10.5 or better to be
used with Carbon.
- It should be also noted that at the low level on OS X, there is a
+ It should be also noted that at the low level on \macos, there is a
difference between windows (top-levels) and view (widgets that are inside a
window). For this reason, make sure that the NSView that you are wrapping
doesn't end up as a top-level. The best way to ensure this is to make sure
diff --git a/src/widgets/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm
index 46a43c4110..f6f19db959 100644
--- a/src/widgets/widgets/qmacnativewidget_mac.mm
+++ b/src/widgets/widgets/qmacnativewidget_mac.mm
@@ -42,13 +42,13 @@
/*!
\class QMacNativeWidget
\since 4.5
- \brief The QMacNativeWidget class provides a widget for OS X that provides
+ \brief The QMacNativeWidget class provides a widget for \macos that provides
a way to put Qt widgets into Cocoa hierarchies.
\ingroup advanced
\inmodule QtWidgets
- On OS X, there is a difference between a window and view;
+ On \macos, there is a difference between a window and view;
normally expressed as widgets in Qt. Qt makes assumptions about its
parent-child hierarchy that make it complex to put an arbitrary Qt widget
into a hierarchy of "normal" views from Apple frameworks. QMacNativeWidget
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 7a9a077e5f..50ba7f97ec 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1547,7 +1547,7 @@ bool QMainWindow::event(QEvent *event)
/*!
\property QMainWindow::unifiedTitleAndToolBarOnMac
- \brief whether the window uses the unified title and toolbar look on OS X
+ \brief whether the window uses the unified title and toolbar look on \macos
Note that the Qt 5 implementation has several limitations compared to Qt 4:
\list
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 184dd42fe6..c194547f2d 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -1432,7 +1432,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
do not support the signals: aboutToHide (), aboutToShow () and hovered ().
It is not possible to display an icon in a native menu on Windows Mobile.
- \section1 QMenu on OS X with Qt Build Against Cocoa
+ \section1 QMenu on \macos with Qt Build Against Cocoa
QMenu can be inserted only once in a menu/menubar. Subsequent insertions will
have no effect or will result in a disabled menu item.
diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm
index 184e4d7bb1..05d01a7f31 100644
--- a/src/widgets/widgets/qmenu_mac.mm
+++ b/src/widgets/widgets/qmenu_mac.mm
@@ -66,7 +66,7 @@ inline QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePla
/*!
\since 5.2
- Returns the native NSMenu for this menu. Available on OS X only.
+ Returns the native NSMenu for this menu. Available on \macos only.
\note Qt sets the delegate on the native menu. If you need to set your own
delegate, make sure you save the original one and forward any calls to it.
@@ -87,7 +87,7 @@ NSMenu *QMenu::toNSMenu()
\since 5.2
Set this menu to be the dock menu available by option-clicking
- on the application dock icon. Available on OS X only.
+ on the application dock icon. Available on \macos only.
*/
void QMenu::setAsDockMenu()
{
@@ -105,7 +105,7 @@ void QMenu::setAsDockMenu()
\deprecated
Sets this \a menu to be the dock menu available by option-clicking
- on the application dock icon. Available on OS X only.
+ on the application dock icon. Available on \macos only.
Deprecated; use \l QMenu::setAsDockMenu() instead.
*/
@@ -135,7 +135,7 @@ void QMenuPrivate::moveWidgetToPlatformItem(QWidget *widget, QPlatformMenuItem*
/*!
\since 5.2
- Returns the native NSMenu for this menu bar. Available on OS X only.
+ Returns the native NSMenu for this menu bar. Available on \macos only.
\note Qt may set the delegate on the native menu bar. If you need to set your
own delegate, make sure you save the original one and forward any calls to it.
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 3f42a07f39..d7a8ecdae1 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -610,15 +610,15 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
for items in the menu bar are only shown when the \uicontrol{Alt} key is
pressed.
- \section1 QMenuBar on OS X
+ \section1 QMenuBar on \macos
- QMenuBar on OS X is a wrapper for using the system-wide menu bar.
+ QMenuBar on \macos is a wrapper for using the system-wide menu bar.
If you have multiple menu bars in one dialog the outermost menu bar
(normally inside a widget with widget flag Qt::Window) will
be used for the system-wide menu bar.
- Qt for OS X also provides a menu bar merging feature to make
- QMenuBar conform more closely to accepted OS X menu bar layout.
+ Qt for \macos also provides a menu bar merging feature to make
+ QMenuBar conform more closely to accepted \macos menu bar layout.
The merging functionality is based on string matching the title of
a QMenu entry. These strings are translated (using QObject::tr())
in the "QMenuBar" context. If an entry is moved its slots will still
@@ -657,7 +657,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
\b{Note:} The text used for the application name in the menu
bar is obtained from the value set in the \c{Info.plist} file in
- the application's bundle. See \l{Qt for OS X - Deployment}
+ the application's bundle. See \l{Qt for macOS - Deployment}
for more information.
\section1 QMenuBar on Windows CE
@@ -902,7 +902,7 @@ void QMenuBar::setActiveAction(QAction *act)
/*!
Removes all the actions from the menu bar.
- \note On OS X, menu items that have been merged to the system
+ \note On \macos, menu items that have been merged to the system
menu bar are not removed by this function. One way to handle this
would be to remove the extra actions yourself. You can set the
\l{QAction::MenuRole}{menu role} on the different menus, so that
@@ -1809,7 +1809,7 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
\since 4.6
This property specifies whether or not the menubar should be used as a native menubar on platforms
- that support it. The currently supported platforms are OS X and Windows CE. On these platforms
+ that support it. The currently supported platforms are \macos and Windows CE. On these platforms
if this property is \c true, the menubar is used in the native menubar and is not in the window of
its parent, if false the menubar remains in the window. On other platforms the value of this
attribute has no effect.
diff --git a/src/widgets/widgets/qrubberband.cpp b/src/widgets/widgets/qrubberband.cpp
index 60082a8930..ef95c15cb3 100644
--- a/src/widgets/widgets/qrubberband.cpp
+++ b/src/widgets/widgets/qrubberband.cpp
@@ -126,7 +126,7 @@ void QRubberBand::initStyleOption(QStyleOptionRubberBand *option) const
By default a rectangular rubber band (\a s is \c Rectangle) will
use a mask, so that a small border of the rectangle is all
- that is visible. Some styles (e.g., native OS X) will
+ that is visible. Some styles (e.g., native \macos) will
change this and call QWidget::setWindowOpacity() to make a
semi-transparent filled selection rectangle.
*/
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index fc27654add..ed820888b4 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -2335,7 +2335,7 @@ void QTabBar::setMovable(bool movable)
\since 4.5
This property is used as a hint for styles to draw the tabs in a different
- way then they would normally look in a tab widget. On OS X this will
+ way then they would normally look in a tab widget. On \macos this will
look similar to the tabs in Safari or Leopard's Terminal.app.
\sa QTabWidget::documentMode
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 0379bad723..524e2d4fa0 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -1316,7 +1316,7 @@ void QTabWidget::setUsesScrollButtons(bool useButtons)
/*!
\property QTabWidget::documentMode
\brief Whether or not the tab widget is rendered in a mode suitable for document
- pages. This is the same as document mode on OS X.
+ pages. This is the same as document mode on \macos.
\since 4.5
When this property is set the tab widget frame is not rendered. This mode is useful
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 375eff7ae8..f8b2dff720 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -870,7 +870,7 @@ QToolButton::ToolButtonPopupMode QToolButton::popupMode() const
The default is disabled (i.e. false).
- This property is currently ignored on OS X when using QMacStyle.
+ This property is currently ignored on \macos when using QMacStyle.
*/
void QToolButton::setAutoRaise(bool enable)
{