summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-05-28 12:45:48 +0200
committerNico Vertriest <nico.vertriest@digia.com>2015-06-30 07:33:31 +0000
commita7f2af09114cfa0996794c85bc48a601f665772d (patch)
treea36d84d2026c90ba866954cb1ec7e4f7f7429ffe /src/widgets/kernel/qwidget.cpp
parent592f355271df09c791682650a64ef42ffe898a27 (diff)
Replace MAC OS X with OS X
Task-number: QTBUG-46374 Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
-rw-r--r--src/widgets/kernel/qwidget.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 88d7cdce76..bd77e7f616 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2454,7 +2454,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 Mac OS X, the type returned depends on which framework Qt was linked
+ On OS X, 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.
@@ -2590,7 +2590,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 Mac OS X.
+ Since Qt 4.5, Qt style sheets fully supports OS X.
\warning Qt style sheets are currently not supported for custom QStyle
subclasses. We plan to address this in some future release.
@@ -5065,7 +5065,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 Mac OS X the widget will be
+ \note The \a painter must be active. On OS X the widget will be
rendered into a QPixmap and then drawn by the \a painter.
\sa QPainter::device()
@@ -6181,7 +6181,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 Mac OS X, this has an added benefit that it sets the
+ Additionally, on OS X, 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.
@@ -11204,7 +11204,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, Mac OS X, Windows,
+ This feature is available on Embedded Linux, OS X, Windows,
and X11 platforms that support the Composite extension.
This feature is not available on Windows CE.
@@ -11267,7 +11267,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 Mac OS X the close button will have a
+ varied by the platform. On OS X the close button will have a
modified look; on other platforms, the window title will have an
'*' (asterisk).