1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace MAC OS X with OS X

Browse Source 
Task-number: QTBUG-46374
Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Nico Vertriest 2015-05-28 12:45:48 +02:00
parent 592f355271
commit a7f2af0911
87 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/common/c++11/c++11.cpp
View File

@ -40,7 +40,7 @@
#include <utility>
#if defined(__clang__)
# if __has_feature(cxx_generalized_initializers)
// On Mac OS X, the libstdc++ headers don't include <initializer_list>
// On OS X, the libstdc++ headers don't include <initializer_list>
// This #include here forces a failure unless we're using libc++
# include <initializer_list>
# endif

6
examples/widgets/doc/src/application.qdoc
View File

@ -232,7 +232,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 Mac OS X styles), but for some
styles (e.g., Windows and OS X styles), but for some
styles this makes sure that \uicontrol{Help} is pushed to the right
side of the menu bar.
@ -258,7 +258,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 Mac OS X, it uses the native XML-based
Windows registry; on OS X, it uses the native XML-based
CFPreferences API; on Unix/X11, it uses text files.
The QSettings constructor takes arguments that identify your
@ -310,7 +310,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 Mac OS X, this makes no difference, but on Windows,
On Unix and OS X, this makes no difference, but on Windows,
it ensures that the "\\r\\n" end-of-line sequence is converted to
"\\n" when reading.

4
examples/widgets/doc/src/classwizard.qdoc
View File

@ -76,7 +76,7 @@
\endlist
Although the program is just an example, if you press \uicontrol Finish
(\uicontrol Done on Mac OS X), actual C++ source files will actually be
(\uicontrol Done on OS X), 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 Mac OS X). The fields' values
\uicontrol Next button (\uicontrol Continue on OS X). The fields' values
can be accessed from any other page using QWizardPage::field(),
or from the wizard code using QWizard::field().

4
examples/widgets/doc/src/licensewizard.qdoc
View File

@ -94,7 +94,7 @@
\snippet dialogs/licensewizard/licensewizard.cpp 4
We set the style to \l{QWizard::}{ModernStyle} on all platforms
except Mac OS X,
except OS X,
\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 Mac OS X). The fields' values
\uicontrol Next button (\uicontrol Continue on OS X). The fields' values
can be accessed from any other page using QWizardPage::field().
Resetting the page amounts to clearing the two text fields.

2
examples/widgets/doc/src/plugandpaint.qdoc
View File

@ -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 Mac OS X,
file, and to do a \l{QDir::cd()}{cd()}. On Windows and OS X,
this file is usually located in a subdirectory, so we need to
take this into account.

2
examples/widgets/mainwindows/mainwindow/mainwindow.cpp
View File

@ -68,7 +68,7 @@ static const char * const message =
"(right-click) menu.</p>"
#ifdef Q_OS_MAC
"<p>On Mac OS X, the \"Black\" dock widget has been created as a "
"<p>On OS X, the \"Black\" dock widget has been created as a "
"<em>Drawer</em>, which is a special kind of QDockWidget.</p>"
#endif
;

2
qmake/library/qmakeevaluator.cpp
View File

@ -88,7 +88,7 @@ static int idealThreadCount()
// we don't need them all here
int cores = 1;
# if defined(Q_OS_BSD4)
// FreeBSD, OpenBSD, NetBSD, BSD/OS, Mac OS X
// FreeBSD, OpenBSD, NetBSD, BSD/OS, OS X
size_t len = sizeof(cores);
int mib[2];
mib[0] = CTL_HW;

4
src/corelib/global/qglobal.cpp
View File

@ -1124,7 +1124,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
\value MV_10_4 Mac OS X 10.4 (unsupported)
\value MV_10_5 Mac OS X 10.5 (unsupported)
\value MV_10_6 Mac OS X 10.6
\value MV_10_7 OS X 10.7
\value MV_10_7 Mac OS X 10.7
\value MV_10_8 OS X 10.8
\value MV_10_9 OS X 10.9
\value MV_10_10 OS X 10.10
@ -2731,7 +2731,7 @@ QString QSysInfo::prettyProductName()
basename = "Mac OS X Snow Leopard (";
break;
case MV_LION:
basename = "Mac OS X Lion (";
basename = "OS X Lion (";
break;
case MV_MOUNTAINLION:
basename = "OS X Mountain Lion (";

2
src/corelib/io/qfilesystemwatcher.cpp
View File

@ -185,7 +185,7 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re
the file system monitor. Also note that your process may have
other file descriptors open in addition to the ones for files
being monitored, and these other open descriptors also count in
the total. OS X 10.5 and up use a different backend and do not
the total. Mac OS X 10.5 and up use a different backend and do not
suffer from this issue.

2
src/gui/accessible/qaccessible.cpp
View File

@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
to replace or extend the default behavior of the static functions
in QAccessible.
Qt supports Microsoft Active Accessibility (MSAA), Mac OS X
Qt supports Microsoft Active Accessibility (MSAA), OS X
Accessibility, and the Unix/X11 AT-SPI standard. Other backends
can be supported using QAccessibleBridge.

2
src/gui/accessible/qaccessiblebridge.cpp
View File

@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
\ingroup accessibility
\inmodule QtWidgets
Qt supports Microsoft Active Accessibility (MSAA), Mac OS X
Qt supports Microsoft Active Accessibility (MSAA), OS X
Accessibility, and the Unix/X11 AT-SPI standard. By subclassing
QAccessibleBridge, you can support other backends than the
predefined ones.

18
src/gui/kernel/qclipboard.cpp
View File

@ -110,22 +110,22 @@ QT_BEGIN_NAMESPACE
\endlist
\section1 Notes for Mac OS X Users
\section1 Notes for OS X Users
Mac OS X supports a separate find buffer that holds the current
OS X supports a separate find buffer that holds the current
search string in Find operations. This find clipboard can be accessed
by specifying the FindBuffer mode.
\section1 Notes for Windows and Mac OS X Users
\section1 Notes for Windows and OS X Users
\list
\li Windows and Mac OS X do not support the global mouse
\li Windows and OS X do not support the global mouse
selection; they only supports the global clipboard, i.e. they
only add text to the clipboard when an explicit copy or cut is
made.
\li Windows and Mac OS X does not have the concept of ownership;
\li Windows and OS X does not have the concept of ownership;
the clipboard is a fully global resource so all applications are
notified of changes.
@ -181,7 +181,7 @@ QClipboard::~QClipboard()
This signal is emitted when the clipboard data is changed.
On Mac OS X and with Qt version 4.3 or higher, clipboard
On OS X and with Qt version 4.3 or higher, clipboard
changes made by other applications will only be detected
when the application is activated.
@ -193,7 +193,7 @@ QClipboard::~QClipboard()
This signal is emitted when the selection is changed. This only
applies to windowing systems that support selections, e.g. X11.
Windows and Mac OS X don't support selections.
Windows and OS X don't support selections.
\sa dataChanged(), findBufferChanged(), changed()
*/
@ -203,7 +203,7 @@ QClipboard::~QClipboard()
\since 4.2
This signal is emitted when the find buffer is changed. This only
applies to Mac OS X.
applies to OS X.
With Qt version 4.3 or higher, clipboard changes made by other
applications will only be detected when the application is activated.
@ -226,7 +226,7 @@ QClipboard::~QClipboard()
systems with a global mouse selection (e.g. X11).
\value FindBuffer indicates that data should be stored and retrieved from
the Find buffer. This mode is used for holding search strings on Mac OS X.
the Find buffer. This mode is used for holding search strings on OS X.
\omitvalue LastMode

4
src/gui/kernel/qdrag.cpp
View File

@ -218,7 +218,7 @@ QObject *QDrag::target() const
from are specified in \a supportedActions. The default proposed action will be selected
among the allowed actions in the following order: Move, Copy and Link.
\b{Note:} On Linux and Mac OS X, the drag and drop operation
\b{Note:} On Linux and OS X, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is
@ -240,7 +240,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions)
The \a defaultDropAction determines which action will be proposed when the user performs a
drag without using modifier keys.
\b{Note:} On Linux and Mac OS X, the drag and drop operation
\b{Note:} On Linux and OS X, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is

14
src/gui/kernel/qevent.cpp
View File

@ -575,7 +575,7 @@ QHoverEvent::~QHoverEvent()
wheel event delta: angleDelta() returns the delta in wheel
degrees. This value is always provided. pixelDelta() returns
the delta in screen pixels and is available on platforms that
have high-resolution trackpads, such as Mac OS X. If that is the
have high-resolution trackpads, such as OS X. If that is the
case, source() will return Qt::MouseEventSynthesizedBySystem.
The functions pos() and globalPos() return the mouse cursor's
@ -795,7 +795,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
Returns the scrolling distance in pixels on screen. This value is
provided on platforms that support high-resolution pixel-based
delta values, such as Mac OS X. The value should be used directly
delta values, such as OS X. The value should be used directly
to scroll content on screen.
Example:
@ -936,7 +936,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
Returns the scrolling phase of this wheel event.
\note The Qt::ScrollBegin and Qt::ScrollEnd phases are currently
supported only on Mac OS X.
supported only on OS X.
*/
@ -1548,7 +1548,7 @@ QCloseEvent::~QCloseEvent()
\ingroup events
Icon drag events are sent to widgets when the main icon of a window
has been dragged away. On Mac OS X, this happens when the proxy
has been dragged away. On OS X, this happens when the proxy
icon of a window is dragged off the title bar.
It is normal to begin using drag and drop in response to this
@ -3322,12 +3322,12 @@ QShowEvent::~QShowEvent()
when the operating system requests that a file or URL should be opened.
This is a high-level event that can be caused by different user actions
depending on the user's desktop environment; for example, double
clicking on an file icon in the Finder on Mac OS X.
clicking on an file icon in the Finder on OS X.
This event is only used to notify the application of a request.
It may be safely ignored.
\note This class is currently supported for Mac OS X only.
\note This class is currently supported for OS X only.
*/
/*!
@ -3393,7 +3393,7 @@ bool QFileOpenEvent::openFile(QFile &file, QIODevice::OpenMode flags) const
\internal
\class QToolBarChangeEvent
\brief The QToolBarChangeEvent class provides an event that is
sent whenever a the toolbar button is clicked on Mac OS X.
sent whenever a the toolbar button is clicked on OS X.
\ingroup events
\inmodule QtGui

2
src/gui/kernel/qguiapplication.cpp
View File

@ -975,7 +975,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
\list
\li \c android
\li \c cocoa is a platform plugin for Mac OS X.
\li \c cocoa is a platform plugin for OS X.
\li \c directfb
\li \c eglfs is a platform plugin for running Qt5 applications on top of
EGL and OpenGL ES 2.0 without an actual windowing system (like X11

16
src/gui/kernel/qkeysequence.cpp
View File

@ -193,7 +193,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
QKeySequence objects can be cast to a QString to obtain a human-readable
translated version of the sequence. Similarly, the toString() function
produces human-readable strings for use in menus. On Mac OS X, the
produces human-readable strings for use in menus. On OS X, the
appropriate symbols are used to describe keyboard shortcuts using special
keys on the Macintosh keyboard.
@ -201,12 +201,12 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
code point of the character; for example, 'A' gives the same key sequence
as Qt::Key_A.
\b{Note:} On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control
\b{Note:} On OS X, references to "Ctrl", Qt::CTRL, Qt::Control
and Qt::ControlModifier correspond to the \uicontrol Command keys on the
Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and
Qt::MetaModifier correspond to the \uicontrol Control keys. Developers on
Mac OS X can use the same shortcut descriptions across all platforms,
and their applications will automatically work as expected on Mac OS X.
OS X can use the same shortcut descriptions across all platforms,
and their applications will automatically work as expected on OS X.
\section1 Standard Shortcuts
@ -215,12 +215,12 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
setting up actions in a typical application. The table below shows
some common key sequences that are often used for these standard
shortcuts by applications on four widely-used platforms. Note
that on Mac OS X, the \uicontrol Ctrl value corresponds to the \uicontrol
that on OS X, the \uicontrol Ctrl value corresponds to the \uicontrol
Command keys on the Macintosh keyboard, and the \uicontrol Meta value
corresponds to the \uicontrol Control keys.
\table
\header \li StandardKey \li Windows \li Mac OS X \li KDE \li GNOME
\header \li StandardKey \li Windows \li OS X \li KDE \li GNOME
\row \li HelpContents \li F1 \li Ctrl+? \li F1 \li F1
\row \li WhatsThis \li Shift+F1 \li Shift+F1 \li Shift+F1 \li Shift+F1
\row \li Open \li Ctrl+O \li Ctrl+O \li Ctrl+O \li Ctrl+O
@ -1206,7 +1206,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
#if defined(Q_OS_MACX)
if (nativeText) {
// On Mac OS X the order (by default) is Meta, Alt, Shift, Control.
// On OS X the order (by default) is Meta, Alt, Shift, Control.
// If the AA_MacDontSwapCtrlAndMeta is enabled, then the order
// is Ctrl, Alt, Shift, Meta. The macSymbolForQtKey does this swap
// for us, which means that we have to adjust our order here.
@ -1479,7 +1479,7 @@ bool QKeySequence::isDetached() const
If the key sequence has no keys, an empty string is returned.
On Mac OS X, the string returned resembles the sequence that is
On OS X, the string returned resembles the sequence that is
shown in the menu bar.
\sa fromString()

2
src/gui/kernel/qpalette.cpp
View File

@ -382,7 +382,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
\warning 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 both the Windows XP, Windows Vista, and the Mac OS X
case for both the Windows XP, Windows Vista, and the OS X
styles.
\sa QApplication::setPalette(), QWidget::setPalette(), QColor

6
src/gui/painting/qpaintengine.cpp
View File

@ -149,7 +149,7 @@ QFont QTextItem::font() const
provided is the raster paint engine, which contains a software
rasterizer which supports the full feature set on all supported platforms.
This is the default for painting on QWidget-based classes in e.g. on Windows,
X11 and Mac OS X, it is the backend for painting on QImage and it is
X11 and OS X, it is the backend for painting on QImage and it is
used as a fallback for paint engines that do not support a certain
capability. In addition we provide QPaintEngine implementations for
OpenGL (accessible through QGLWidget) and printing (which allows using
@ -363,8 +363,8 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw
\value X11
\value Windows
\value MacPrinter
\value CoreGraphics Mac OS X's Quartz2D (CoreGraphics)
\value QuickDraw Mac OS X's QuickDraw
\value CoreGraphics OS X's Quartz2D (CoreGraphics)
\value QuickDraw OS X's QuickDraw
\value QWindowSystem Qt for Embedded Linux
\value PostScript (No longer supported)
\value OpenGL

2
src/gui/painting/qpainter.cpp
View File

@ -6206,7 +6206,7 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen)
QPen wavePen = pen;
wavePen.setCapStyle(Qt::SquareCap);
// This is to protect against making the line too fat, as happens on Mac OS X
// This is to protect against making the line too fat, as happens on OS X
// due to it having a rather thick width for the regular underline.
const qreal maxPenWidth = .8 * radius;
if (wavePen.widthF() > maxPenWidth)

2
src/gui/painting/qregion.cpp
View File

@ -906,7 +906,7 @@ QRegion QRegion::intersect(const QRect &r) const
sort key and X as the minor sort key.
\endlist
\omit
Only some platforms have these restrictions (Qt for Embedded Linux, X11 and Mac OS X).
Only some platforms have these restrictions (Qt for Embedded Linux, X11 and OS X).
\endomit
*/

4
src/gui/text/qfont.cpp
View File

@ -725,7 +725,7 @@ void QFont::setFamily(const QString &family)
Returns the requested font style name, it will be used to match the
font with irregular styles (that can't be normalized in other style
properties). It depends on system font support, thus only works for
Mac OS X and X11 so far. On Windows irregular styles will be added
OS X and X11 so far. On Windows irregular styles will be added
as separate font families so there is no need for this.
\sa setFamily(), setStyle()
@ -820,7 +820,7 @@ int QFont::pointSize() const
\li Vertical hinting (light)
\li Full hinting
\row
\li Cocoa on Mac OS X
\li Cocoa on OS X
\li No hinting
\li No hinting
\li No hinting

2
src/gui/text/qrawfont.cpp
View File

@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
also have accessors to some relevant data in the physical font.
QRawFont only provides support for the main font technologies: GDI and DirectWrite on Windows
platforms, FreeType on Linux platforms and CoreText on Mac OS X. For other
platforms, FreeType on Linux platforms and CoreText on OS X. For other
font back-ends, the APIs will be disabled.
QRawFont can be constructed in a number of ways:

2
src/gui/text/qtextformat.cpp
View File

@ -1325,7 +1325,7 @@ bool QTextFormat::operator==(const QTextFormat &rhs) const
\value WaveUnderline The text is underlined using a wave shaped line.
\value SpellCheckUnderline The underline is drawn depending on the QStyle::SH_SpellCeckUnderlineStyle
style hint of the QApplication style. By default this is mapped to
WaveUnderline, on Mac OS X it is mapped to DashDotLine.
WaveUnderline, on OS X it is mapped to DashDotLine.
\sa Qt::PenStyle
*/

4
src/network/socket/qabstractsocket.cpp
View File

@ -420,7 +420,7 @@
allowed to rebind, even if they pass ReuseAddressHint. This option
provides more security than ShareAddress, but on certain operating
systems, it requires you to run the server with administrator privileges.
On Unix and Mac OS X, not sharing is the default behavior for binding
On Unix and OS X, not sharing is the default behavior for binding
an address and port, so this option is ignored. On Windows, this
option uses the SO_EXCLUSIVEADDRUSE socket option.
@ -430,7 +430,7 @@
socket option. On Unix, this option is ignored.
\value DefaultForPlatform The default option for the current platform.
On Unix and Mac OS X, this is equivalent to (DontShareAddress
On Unix and OS X, this is equivalent to (DontShareAddress
+ ReuseAddressHint), and on Windows, its equivalent to ShareAddress.
*/

2
src/network/socket/qlocalserver.cpp
View File

@ -141,7 +141,7 @@ QLocalServer::~QLocalServer()
and are created based on the umask. Setting the access flags will
overide this and will restrict or permit access as specified.
Other Unix-based operating systems, such as Mac OS X, do not
Other Unix-based operating systems, such as OS X, do not
honor file permissions for Unix domain sockets and by default
have WorldAccess and these permission flags will have no effect.

2
src/network/ssl/qsslsocket.cpp
View File

@ -136,7 +136,7 @@
setDefaultCaCertificates().
\endlist
\note If available, root certificates on Unix (excluding Mac OS X) will be
\note If available, root certificates on Unix (excluding OS X) will be
loaded on demand from the standard certificate directories. If
you do not want to load root certificates on demand, you need to call either
the static function setDefaultCaCertificates() before the first SSL handshake

2
src/opengl/doc/src/qtopengl-index.qdoc
View File

@ -37,7 +37,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
must be created with another toolkit, such as Cocoa on the Mac OS X
must be created with another toolkit, such as Cocoa on the OS X
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.

2
src/opengl/doc/src/qtopengl-module.qdoc
View File

@ -40,7 +40,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
must be created with another toolkit, such as Cocoa on the Mac OS X
must be created with another toolkit, such as Cocoa on the OS X
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.

2
src/opengl/qgl.cpp
View File

@ -3687,7 +3687,7 @@ void QGLContext::doneCurrent()
QGLWidget. This will side-step the issue altogether, and is what
we recommend for users that need this kind of functionality.
On Mac OS X, when Qt is built with Cocoa support, a QGLWidget
On OS X, when Qt is built with Cocoa support, a QGLWidget
can't have any sibling widgets placed ontop of itself. This is due
to limitations in the Cocoa API and is not supported by Apple.

6
src/opengl/qglpixelbuffer.cpp
View File

@ -60,7 +60,7 @@
an OpenGL texture.} The texture is then updated automatically
when the pbuffer contents change, eliminating the need for
additional copy operations. This is supported only on Windows
and Mac OS X systems that provide the \c render_texture
and OS X systems that provide the \c render_texture
extension. Note that under Windows, a multi-sampled pbuffer
can't be used in conjunction with the \c render_texture
extension. If a multi-sampled pbuffer is requested under
@ -287,7 +287,7 @@ QGLContext *QGLPixelBuffer::context() const
pbuffer contents to a texture using updateDynamicTexture().
\warning For the bindToDynamicTexture() call to succeed on the
Mac OS X, the pbuffer needs a shared context, i.e. the
OS X, the pbuffer needs a shared context, i.e. the
QGLPixelBuffer must be created with a share widget.
\sa generateDynamicTexture(), releaseFromDynamicTexture()
@ -316,7 +316,7 @@ QGLContext *QGLPixelBuffer::context() const
\snippet code/src_opengl_qglpixelbuffer.cpp 1
An alternative on Windows and Mac OS X systems that support the
An alternative on Windows and OS X systems that support the
\c render_texture extension is to use bindToDynamicTexture() to
get dynamic updates of the texture.

2
src/plugins/platforms/cocoa/qcocoahelpers.mm
View File

@ -776,7 +776,7 @@ QString qt_mac_removeAmpersandEscapes(QString s)
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 Mac OS X.
\warning This function is only available on OS X.
\warning This function is duplicated in qmacstyle_mac.mm
*/
CGContextRef qt_mac_cg_context(QPaintDevice *pdev)

2
src/plugins/platforms/cocoa/qpaintengine_mac.mm
View File

@ -559,7 +559,7 @@ QCoreGraphicsPaintEngine::begin(QPaintDevice *pdev)
if ((w->windowType() == Qt::Desktop)) {
if (!unclipped)
qWarning("QCoreGraphicsPaintEngine::begin: Does not support clipped desktop on Mac OS X");
qWarning("QCoreGraphicsPaintEngine::begin: Does not support clipped desktop on OS X");
// ## need to do [qt_mac_window_for(w) makeKeyAndOrderFront]; (need to rename the file)
} else if (unclipped) {
qWarning("QCoreGraphicsPaintEngine::begin: Does not support unclipped painting");

6
src/printsupport/dialogs/qabstractprintdialog.cpp
View File

@ -387,13 +387,13 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
settings for each available printer can be modified via the dialog's
\uicontrol{Properties} push button.
On Windows and Mac OS X, the native print dialog is used, which means that
On Windows and OS X, the native print dialog is used, which means that
some QWidget and QDialog properties set on the dialog won't be respected.
The native print dialog on Mac OS X does not support setting printer options,
The native print dialog on OS X does not support setting printer options,
i.e. setOptions() and setOption() have no effect.
In Qt 4.4, it was possible to use the static functions to show a sheet on
Mac OS X. This is no longer supported in Qt 4.5. If you want this
OS X. This is no longer supported in Qt 4.5. If you want this
functionality, use QPrintDialog::open().
\sa QPageSetupDialog, QPrinter

6
src/printsupport/dialogs/qpagesetupdialog.cpp
View File

@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE
\ingroup printing
\inmodule QtPrintSupport
On Windows and Mac OS X the page setup dialog is implemented using
On Windows and OS X the page setup dialog is implemented using
the native page setup dialogs.
Note that on Windows and Mac OS X custom paper sizes won't be
Note that on Windows and OS X custom paper sizes won't be
reflected in the native page setup dialogs. Additionally, custom
page margins set on a QPrinter won't show in the native Mac OS X
page margins set on a QPrinter won't show in the native OS X
page setup dialog.
\sa QPrinter, QPrintDialog

6
src/printsupport/kernel/qprinter.cpp
View File

@ -311,7 +311,7 @@ public:
features, such as orientation and resolution, and to step through
the pages in a document as it is generated.
When printing directly to a printer on Windows or Mac OS X, QPrinter uses
When printing directly to a printer on Windows or OS X, QPrinter uses
the built-in printer drivers. On X11, QPrinter uses the
\l{Common Unix Printing System (CUPS)}
to send PDF output to the printer. As an alternative,
@ -909,7 +909,7 @@ QString QPrinter::outputFileName() const
QPrinter uses Qt's cross-platform PDF print engines
respectively. If you can produce this format natively, for example
Mac OS X can generate PDF's from its print engine, set the output format
OS X can generate PDF's from its print engine, set the output format
back to NativeFormat.
\sa outputFileName(), setOutputFormat()
@ -1371,7 +1371,7 @@ QPrinter::ColorMode QPrinter::colorMode() const
\obsolete
Returns the number of copies to be printed. The default value is 1.
On Windows, Mac OS X and X11 systems that support CUPS, this will always
On Windows, OS X and X11 systems that support CUPS, this will always
return 1 as these operating systems can internally handle the number
of copies.

16
src/sql/doc/src/sql-driver.qdoc
View File

@ -77,7 +77,7 @@
\target building
\section1 Building the Drivers Using Configure
On Unix and Mac OS X, the Qt \c configure script tries to
On Unix and OS X, the Qt \c configure script tries to
automatically detect the available client libraries on your
machine. Run \c{configure -help} to see what drivers can be
built. You should get an output similar to this:
@ -139,7 +139,7 @@
Please refer to the MySQL documentation, chapter "libmysqld, the Embedded
MySQL Server Library" for more information about the MySQL embedded server.
\section3 How to Build the QMYSQL Plugin on Unix and Mac OS X
\section3 How to Build the QMYSQL Plugin on Unix and OS X
You need the MySQL header files and as well as the shared library
\c{libmysqlclient.so}. Depending on your Linux distribution you may
@ -208,7 +208,7 @@
BLOBs are bound to placeholders or QSqlTableModel, which uses a prepared
query to do this internally.
\section3 How to Build the OCI Plugin on Unix and Mac OS X
\section3 How to Build the OCI Plugin on Unix and OS X
For Oracle 10g, all you need is the "Instant Client Package - Basic" and
"Instant Client Package - SDK". For Oracle prior to 10g, you require
@ -343,7 +343,7 @@
"SQL_WCHAR support" in the ODBC driver manager otherwise Oracle
will convert all Unicode strings to local 8-bit.
\section3 How to Build the ODBC Plugin on Unix and Mac OS X
\section3 How to Build the ODBC Plugin on Unix and OS X
It is recommended that you use unixODBC. You can find the latest
version and ODBC drivers at \l http://www.unixodbc.org.
@ -400,7 +400,7 @@
Binary Large Objects are supported through the \c BYTEA field type in
PostgreSQL server versions >= 7.1.
\section3 How to Build the QPSQL Plugin on Unix and Mac OS X
\section3 How to Build the QPSQL Plugin on Unix and OS X
You need the PostgreSQL client library and headers installed.
@ -440,7 +440,7 @@
Sybase client library. Refer to the Sybase documentation for information on how to set up
a Sybase client configuration file to enable connections to databases on non-default ports.
\section3 How to Build the QTDS Plugin on Unix and Mac OS X
\section3 How to Build the QTDS Plugin on Unix and OS X
Under Unix, two libraries are available which support the TDS protocol:
@ -493,7 +493,7 @@
We suggest using a forward-only query when calling stored procedures
in DB2 (see QSqlQuery::setForwardOnly()).
\section3 How to Build the QDB2 Plugin on Unix and Mac OS X
\section3 How to Build the QDB2 Plugin on Unix and OS X
\snippet code/doc_src_sql-driver.qdoc 18
@ -643,7 +643,7 @@
\snippet code/doc_src_sql-driver.cpp 26
\section3 How to Build the QIBASE Plugin on Unix and Mac OS X
\section3 How to Build the QIBASE Plugin on Unix and OS X
The following assumes InterBase or Firebird is installed in
\c{/opt/interbase}:

2
src/testlib/doc/src/qttestlib-manual.qdoc
View File

@ -314,7 +314,7 @@
\li All platforms
\row \li CPU tick counter
\li -tickcounter
\li Windows, Mac OS X, Linux, many UNIX-like systems.
\li Windows, OS X, Linux, many UNIX-like systems.
\row \li Event Counter
\li -eventcounter
\li All platforms

8
src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
View File

@ -2179,7 +2179,7 @@
\image happyguy.jpg "Happy guy"
Qt provides single-source portability across Microsoft
Windows, Mac OS X, Linux, and all major commercial Unix
Windows, OS X, Linux, and all major commercial Unix
variants. It is also available for embedded devices.
* /
\endcode
@ -2192,7 +2192,7 @@
\image happyguy.jpg image "Happy guy"
Qt provides single-source portability across Microsoft
Windows, Mac OS X, Linux, and all major commercial Unix
Windows, OS X, Linux, and all major commercial Unix
variants. It is also available for embedded devices.
\endquotation
@ -3296,7 +3296,7 @@
/ *!
Qt::HANDLE is a platform-specific handle type
for system objects. This is equivalent to
\c{void *} on Windows and Mac OS X, and to
\c{void *} on Windows and OS X, and to
\c{unsigned long} on X11.
\warning Using this type is not portable.
@ -3308,7 +3308,7 @@
\quotation
Qt::HANDLE is a platform-specific handle type
for system objects. This is equivalent to
\c{void *} on Windows and Mac OS X, and to
\c{void *} on Windows and OS X, and to
\c{unsigned long} on X11.
\warning Using this type is not portable.

2
src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
View File

@ -947,7 +947,7 @@
Qt is a C++ toolkit for cross-platform GUI
application development. Qt provides single-source
portability across Microsoft Windows, Mac OS X, Linux,
portability across Microsoft Windows, OS X, Linux,
and all major commercial Unix variants.
Qt provides application developers with all the

10
src/widgets/dialogs/qfiledialog.cpp
View File

@ -2039,7 +2039,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 Mac OS X, this static function will use the
On Windows, and OS X, 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
@ -2151,7 +2151,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 Mac OS X, this static function will use the
On Windows, and OS X, 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
@ -2279,12 +2279,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 Mac OS X, this static function will use the
On Windows, and OS X, 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 Mac OS X, with its native file
dialog just below the parent's title bar. On OS X, with its native file
dialog, the filter argument is ignored.
On Unix/X11, the normal behavior of the file dialog is to resolve and
@ -2388,7 +2388,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must
be set.
On Windows, and Mac OS X, this static function will use the
On Windows, and OS X, this static function will use the
native file dialog and not a QFileDialog. On Windows CE, if the device has
no native file dialog, a QFileDialog will be used.

18
src/widgets/dialogs/qmessagebox.cpp
View File

@ -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}
{Mac OS X Guidelines}. Similar guidelines apply for the other
{OS X 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 Mac OS X, if you want your message box to appear
On OS X, 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 Mac OS X, if \a parent is not 0 and you want your message box
On OS X, 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 Mac OS X only, if there is exactly one button with the role
\li On OS X only, if there is exactly one button with the role
QMessageBox::RejectRole, it is made the escape button.
\endlist
@ -1803,7 +1803,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 Mac OS X, the
The about box has a single button labelled "OK". On OS X, the
about box is popped up as a modeless window; on other platforms,
it is currently application modal.
@ -1857,7 +1857,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
QApplication provides this functionality as a slot.
On Mac OS X, the about box is popped up as a modeless window; on
On OS X, the about box is popped up as a modeless window; on
other platforms, it is currently application modal.
\sa QApplication::aboutQt()
@ -2622,8 +2622,8 @@ void QMessageBox::setInformativeText(const QString &text)
This function shadows QWidget::setWindowTitle().
Sets the title of the message box to \a title. On Mac OS X,
the window title is ignored (as required by the Mac OS X
Sets the title of the message box to \a title. On OS X,
the window title is ignored (as required by the OS X
Guidelines).
*/
void QMessageBox::setWindowTitle(const QString &title)
@ -2644,7 +2644,7 @@ void QMessageBox::setWindowTitle(const QString &title)
Sets the modality of the message box to \a windowModality.
On Mac OS X, if the modality is set to Qt::WindowModal and the message box
On OS X, 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.
*/

22
src/widgets/dialogs/qwizard.cpp
View File

@ -876,7 +876,7 @@ void QWizardPrivate::switchToPage(int newId, Direction direction)
/*
If there is no default button and the Next or Finish button
is enabled, give focus directly to it as a convenience to the
user. This is the normal case on Mac OS X.
user. This is the normal case on OS X.
Otherwise, give the focus to the new page's first child that
can handle it. If there is no such child, give the focus to
@ -1815,7 +1815,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\inmodule QtWidgets
A wizard (also called an assistant on Mac OS X) is a special type
A wizard (also called an assistant on OS X) 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
@ -2113,10 +2113,10 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
This enum specifies the buttons in a wizard.
\value BackButton The \uicontrol Back button (\uicontrol {Go Back} on Mac OS X)
\value NextButton The \uicontrol Next button (\uicontrol Continue on Mac OS X)
\value BackButton The \uicontrol Back button (\uicontrol {Go Back} on OS X)
\value NextButton The \uicontrol Next button (\uicontrol Continue on OS X)
\value CommitButton The \uicontrol Commit button
\value FinishButton The \uicontrol Finish button (\uicontrol Done on Mac OS X)
\value FinishButton The \uicontrol Finish button (\uicontrol Done on OS X)
\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)
@ -2156,7 +2156,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\value ClassicStyle Classic Windows look
\value ModernStyle Modern Windows look
\value MacStyle Mac OS X look
\value MacStyle OS X look
\value AeroStyle Windows Aero look
\omitvalue NStyles
@ -2629,7 +2629,7 @@ bool QWizard::testOption(WizardOption option) const
\list
\li Windows: HelpButtonOnRight.
\li Mac OS X: NoDefaultButton and NoCancelButton.
\li OS X: NoDefaultButton and NoCancelButton.
\li X11 and QWS (Qt for Embedded Linux): none.
\endlist
@ -2673,7 +2673,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 Mac OS X, the \uicontrol Next button is called \uicontrol
example, on OS X, the \uicontrol Next button is called \uicontrol
Continue.
To add extra buttons to the wizard (e.g., a \uicontrol Print button),
@ -2705,7 +2705,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 Mac OS X, the \uicontrol Next button is called \uicontrol
example, on OS X, the \uicontrol Next button is called \uicontrol
Continue.
\sa button(), setButton(), setButtonText(), QWizardPage::buttonText(),
@ -2891,7 +2891,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
Mac OS X.
OS X.
\sa QWizardPage::pixmap(), {Elements of a Wizard Page}
*/
@ -3803,7 +3803,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 Mac OS X, the \uicontrol Next button is called \uicontrol
For example, on OS X, the \uicontrol Next button is called \uicontrol
Continue.
\sa setButtonText(), QWizard::buttonText(), QWizard::setButtonText()

2
src/widgets/doc/snippets/macmainwindow.mm
View File

@ -269,7 +269,7 @@ MacMainWindow::MacMainWindow()
textedit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
textedit->setText("<br><br><br><br><br><br><center><b>This demo shows how to create a \
Qt main window application that has the same appearance as other \
Mac OS X applications such as Mail or iTunes. This includes \
OS X applications such as Mail or iTunes. This includes \
customizing the item views and QSplitter and wrapping native widgets \
such as the search field.</b></center>");

2
src/widgets/doc/src/graphicsview.qdoc
View File

@ -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 Mac OS X.
Qt::Drawer flags that are common on OS X.
The capabilities of QGraphicsWidget are expected to grow depending
on community feedback.

4
src/widgets/doc/src/widgets-and-layouts/focus.qdoc
View File

@ -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 Mac OS X and X11, it's handled by
widget that has keyboard focus. On OS X 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, Mac OS X, and X11.
Windows, OS X, and X11.
\section2 The User Moves the Focus to This Window

2
src/widgets/doc/src/widgets-and-layouts/styles.qdoc
View File

@ -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
Mac OS X), but it isn't mandatory.
OS X), 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

8
src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
View File

@ -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 Mac OS X) by the
platforms' guidelines and (on Windows XP and OS X) 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 Mac OS X
\li Pagefold theme running on OS X
\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 Mac OS X.
Since Qt 4.5, Qt style sheets fully supports OS X.
*/
@ -3745,7 +3745,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 Mac OS X, you can use the following
(instead of the edges) like on OS X, you can use the following
stylesheet:
\snippet code/doc_src_stylesheet.qdoc 136

2
src/widgets/doc/src/widgets-tutorial.qdoc
View File

@ -110,7 +110,7 @@
make sure that the executable is on your path, or enter its
full location.
\li On Linux/Unix and Mac OS X, type \c make and press
\li On Linux/Unix and OS X, type \c make and press
\uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
press \uicontrol{Return}.

2
src/widgets/graphicsview/qgraphicssceneevent.cpp
View File

@ -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 Mac OS X, this means the menu button was pressed.
Windows and OS X, 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).

2
src/widgets/itemviews/qfileiconprovider.cpp
View File

@ -445,7 +445,7 @@ QString QFileIconProvider::type(const QFileInfo &info) const
if (info.isSymLink())
#ifdef Q_OS_MAC
return QApplication::translate("QFileDialog", "Alias", "Mac OS X Finder");
return QApplication::translate("QFileDialog", "Alias", "OS X Finder");
#else
return QApplication::translate("QFileDialog", "Shortcut", "All other platforms");
#endif

6
src/widgets/kernel/qapplication.cpp
View File

@ -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 Mac OS X styles.
Windows Vista, and OS X styles.
\sa QWidget::setPalette(), palette(), QStyle::polish()
*/
@ -3229,7 +3229,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
QApplicationPrivate::giveFocusAccordingToFocusPolicy(w, e, relpos);
// ### Qt 5 These dynamic tool tips should be an OPT-IN feature. Some platforms
// like Mac OS X (probably others too), can optimize their views by not
// like OS X (probably others too), can optimize their views by not
// dispatching mouse move events. We have attributes to control hover,
// and mouse tracking, but as long as we are deciding to implement this
// feature without choice of opting-in or out, you ALWAYS have to have
@ -3934,7 +3934,7 @@ bool QApplication::keypadNavigationEnabled()
Currently this function does nothing on Qt for Embedded Linux.
On Mac OS X, this works more at the application level and will cause the
On OS X, 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

2
src/widgets/kernel/qdesktopwidget.qdoc
View File

@ -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 Mac OS X, or the task bar on Windows). The default screen is used if
on OS X, or the task bar on Windows). The default screen is used if
\a screen is -1.
\sa screenNumber(), screenGeometry()

2
src/widgets/kernel/qstandardgestures.cpp
View File

@ -53,7 +53,7 @@ QGesture *QPanGestureRecognizer::create(QObject *target)
{
if (target && target->isWidgetType()) {
#if (defined(Q_OS_MACX) || defined(Q_OS_WIN)) && !defined(QT_NO_NATIVE_GESTURES)
// for scroll areas on Windows and Mac OS X we want to use native gestures instead
// for scroll areas on Windows and OS X we want to use native gestures instead
if (!qobject_cast<QAbstractScrollArea *>(target->parent()))
static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents);
#else

12
src/widgets/kernel/qwidget.cpp
View File

@ -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).

4
src/widgets/kernel/qwidgetaction.cpp
View File

@ -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 {Mac OS X}: If you add a widget to a menu in the application's menu
bar on Mac OS X, the widget will be added and it will function but with some
\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
limitations:
\list 1
\li The widget is reparented away from the QMenu to the native menu

12
src/widgets/styles/qmacstyle.qdoc
View File

@ -28,7 +28,7 @@
/*!
\class QMacStyle
\brief The QMacStyle class provides a Mac OS X style using the Apple Appearance Manager.
\brief The QMacStyle class provides a OS X 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 Mac OS X. This is done by having primitives
in QStyle implemented in terms of what Mac OS X would normally theme.
theme in use on OS X. This is done by having primitives
in QStyle implemented in terms of what OS X would normally theme.
\warning This style is only available on Mac OS X because it relies on the
\warning This style is only available on OS X 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 - Mac OS X allows widgets to have specific fixed sizes. Qt
\li Widget size - OS X 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 Mac OS X.
with new advances and design suggestions for OS X.
Note that the functions provided by QMacStyle are
reimplementations of QStyle functions; see QStyle for their

2
src/widgets/styles/qmacstyle_mac.mm
View File

@ -7193,7 +7193,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 Mac OS X.
\warning This function is only available on OS X.
\warning This function is duplicated in the Cocoa platform plugin.
*/

4
src/widgets/styles/qstyle.cpp
View File

@ -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 Mac OS X),
special effects (such as animated default buttons on OS X),
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 Mac OS X), but it isn't
(such as animated default buttons on OS X), 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.

2
src/widgets/styles/qstyleoption.cpp
View File

@ -1739,7 +1739,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 Mac OS X).
\value Scroller A popup menu scroller (currently only used on OS X).
\value TearOff A tear-off handle for the menu.
\value Margin The margin of the menu.
\value EmptyArea The empty area of the menu.

2
src/widgets/util/qscroller.cpp
View File

@ -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 Mac OS X.
windowing system, for example on OS X.
*/
QPointF QScroller::pixelPerMeter() const
{

8
src/widgets/util/qsystemtrayicon.cpp
View File

@ -76,7 +76,7 @@ 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 Mac OS X. Note that the Growl
\li All supported versions of OS X. 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).
\endlist
@ -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 Mac OS X, this is currenly converted to a NSMenu, so the
On OS X, 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
@ -323,7 +323,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 Mac OS X.
Currently this signal is not sent on OS X.
\note We follow Microsoft Windows XP/Vista behavior, so the
signal is also emitted when the user clicks on a tray icon with
@ -374,7 +374,7 @@ bool QSystemTrayIcon::supportsMessages()
On Windows, the \a millisecondsTimeoutHint is usually ignored by the system
when the application has focus.
On Mac OS X, the Growl notification system must be installed for this function to
On OS X, the Growl notification system must be installed for this function to
display messages.
Has been turned into a slot in Qt 5.2.

2
src/widgets/widgets/qcombobox.cpp
View File

@ -2699,7 +2699,7 @@ void QComboBox::showPopup()
qScrollEffect(container, scrollDown ? QEffects::DownScroll : QEffects::UpScroll, 150);
#endif
// Don't disable updates on Mac OS X. Windows are displayed immediately on this platform,
// Don't disable updates on OS X. Windows are displayed immediately on this platform,
// which means that the window will be visible before the call to container->show() returns.
// If updates are disabled at this point we'll miss our chance at painting the popup
// menu before it's shown, causing flicker since the window then displays the standard gray

4
src/widgets/widgets/qdialogbuttonbox.cpp
View File

@ -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 Mac OS X:
HelpRole can be considered modeless and have an alternate look on OS X:
\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 Mac OS X.
\value MacLayout Use a policy appropriate for applications on OS X.
\value KdeLayout Use a policy appropriate for applications on KDE.
\value GnomeLayout Use a policy appropriate for applications on GNOME.

4
src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
View File

@ -43,7 +43,7 @@
\class QMacCocoaViewContainer
\since 4.5
\brief The QMacCocoaViewContainer class provides a widget for Mac OS X that can be used to wrap arbitrary
\brief The QMacCocoaViewContainer class provides a widget for OS X that can be used to wrap arbitrary
Cocoa views (i.e., NSView subclasses) and insert them into Qt hierarchies.
\ingroup advanced
@ -61,7 +61,7 @@
Cocoa. However, QCocoaContainerView requires Mac OS X 10.5 or better to be
used with Carbon.
It should be also noted that at the low level on Mac OS X, there is a
It should be also noted that at the low level on OS X, 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

4
src/widgets/widgets/qmacnativewidget_mac.mm
View File

@ -42,13 +42,13 @@
/*!
\class QMacNativeWidget
\since 4.5
\brief The QMacNativeWidget class provides a widget for Mac OS X that provides
\brief The QMacNativeWidget class provides a widget for OS X that provides
a way to put Qt widgets into Cocoa hierarchies.
\ingroup advanced
\inmodule QtWidgets
On Mac OS X, there is a difference between a window and view;
On OS X, 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

2
src/widgets/widgets/qmainwindow.cpp
View File

@ -1499,7 +1499,7 @@ bool QMainWindow::event(QEvent *event)
/*!
\property QMainWindow::unifiedTitleAndToolBarOnMac
\brief whether the window uses the unified title and toolbar look on Mac OS X
\brief whether the window uses the unified title and toolbar look on OS X
Note that the Qt 5 implementation has several limitations compared to Qt 4:
\list

2
src/widgets/widgets/qmenu.cpp
View File

@ -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 Mac OS X with Qt Build Against Cocoa
\section1 QMenu on OS X 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.

2
src/widgets/widgets/qrubberband.cpp
View File

@ -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 Mac OS X) will
that is visible. Some styles (e.g., native OS X) will
change this and call QWidget::setWindowOpacity() to make a
semi-transparent filled selection rectangle.
*/

2
src/widgets/widgets/qtabbar.cpp
View File

@ -2299,7 +2299,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 Mac OS X this will
way then they would normally look in a tab widget. On OS X this will
look similar to the tabs in Safari or Leopard's Terminal.app.
\sa QTabWidget::documentMode

2
src/widgets/widgets/qtabwidget.cpp
View File

@ -1318,7 +1318,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 Mac OS X.
pages. This is the same as document mode on OS X.
\since 4.5
When this property is set the tab widget frame is not rendered. This mode is useful

2
src/widgets/widgets/qtoolbar.cpp
View File

@ -240,7 +240,7 @@ bool QToolBarPrivate::mousePressEvent(QMouseEvent *event)
q->initStyleOption(&opt);
if (q->style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, q).contains(event->pos()) == false) {
#ifdef Q_OS_OSX
// When using the unified toolbar on Mac OS X, the user can click and
// When using the unified toolbar on OS X, the user can click and
// drag between toolbar contents to move the window. Make this work by
// implementing the standard mouse-dragging code and then call
// window->move() in mouseMoveEvent below.

2
src/widgets/widgets/qtoolbutton.cpp
View File

@ -863,7 +863,7 @@ QToolButton::ToolButtonPopupMode QToolButton::popupMode() const
The default is disabled (i.e. false).
This property is currently ignored on Mac OS X when using QMacStyle.
This property is currently ignored on OS X when using QMacStyle.
*/
void QToolButton::setAutoRaise(bool enable)
{

2
src/widgets/widgets/qwidgettextcontrol.cpp
View File

@ -248,7 +248,7 @@ bool QWidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e)
return false;
}
// Except for pageup and pagedown, Mac OS X has very different behavior, we don't do it all, but
// Except for pageup and pagedown, OS X has very different behavior, we don't do it all, but
// here's the breakdown:
// Shift still works as an anchor, but only one of the other keys can be down Ctrl (Command),
// Alt (Option), or Meta (Control).

2
tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
View File

@ -1837,7 +1837,7 @@ static QRegion qRegionData(int index)
case 12: return QRegion(0, 0, 3, 3, QRegion::Ellipse);
#else
case 7:
qWarning("Skipping streaming of elliptical regions on embedded, Mac OS X, and X11;"
qWarning("Skipping streaming of elliptical regions on embedded, OS X, and X11;"
" our pointarray stuff is not that great at approximating.");
#endif
}

2
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -2192,7 +2192,7 @@ void tst_QFile::removeOpenFile()
bool opened = f.open(QIODevice::ReadOnly);
QVERIFY(opened);
f.readAll();
// this used to only fail on FreeBSD (and Mac OS X)
// this used to only fail on FreeBSD (and OS X)
QVERIFY(f.flush());
bool removed = f.remove(); // remove should both close and remove the file
QVERIFY(removed);

2
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -1281,7 +1281,7 @@ void tst_QFileInfo::isHidden_data()
#endif
#if defined(Q_OS_MAC)
// /bin has the hidden attribute on Mac OS X
// /bin has the hidden attribute on OS X
QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << true;
#elif !defined(Q_OS_WIN)
QTest::newRow("/bin/") << QString::fromLatin1("/bin/") << false;

2
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -1558,7 +1558,7 @@ void tst_QProcess::failToStart()
QVERIFY(finishedSpy.isValid());
QVERIFY(finishedSpy2.isValid());
// Mac OS X and HP-UX have a really low default process limit (~100), so spawning
// OS X and HP-UX have a really low default process limit (~100), so spawning
// to many processes here will cause test failures later on.
#if defined Q_OS_HPUX
const int attempts = 15;

2
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -1476,7 +1476,7 @@ void tst_QSettings::remove()
void tst_QSettings::contains()
{
QSettings settings1(QSettings::UserScope, "software.org", "KillerAPP");
int initialNumKeys = settings1.allKeys().size(); // 0 on all platforms but Mac OS X.
int initialNumKeys = settings1.allKeys().size(); // 0 on all platforms but OS X.
settings1.setValue("alpha/beta/geometry", -7);
settings1.setValue("alpha/beta/geometry/x", 1);
settings1.setValue("alpha/beta/geometry/y", 2);

2
tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
View File

@ -103,7 +103,7 @@ void tst_QCollator::compare_data()
It's hard to test English, because it's treated differently
on different platforms. For example, on Linux, it uses the
iso14651_t1 template file, which happens to provide good
defaults for Swedish. Mac OS X seems to do a pure bytewise
defaults for Swedish. OS X seems to do a pure bytewise
comparison of Latin-1 values, although I'm not sure. So I
just test digits to make sure that it's not totally broken.
*/

2
tests/auto/corelib/tools/qstring/tst_qstring.cpp
View File

@ -4843,7 +4843,7 @@ void tst_QString::localeAwareCompare_data()
It's hard to test English, because it's treated differently
on different platforms. For example, on Linux, it uses the
iso14651_t1 template file, which happens to provide good
defaults for Swedish. Mac OS X seems to do a pure bytewise
defaults for Swedish. OS X seems to do a pure bytewise
comparison of Latin-1 values, although I'm not sure. So I
just test digits to make sure that it's not totally broken.
*/

2
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
View File

@ -400,7 +400,7 @@ void tst_QKeySequence::keyBindings()
void tst_QKeySequence::mnemonic_data()
{
#ifdef Q_OS_MAC
QSKIP("Test not applicable to Mac OS X");
QSKIP("Test not applicable to OS X");
#endif
QTest::addColumn<QString>("string");
QTest::addColumn<QString>("key");

4
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
View File

@ -363,7 +363,7 @@ void tst_QMessageBox::statics()
}
}
// shortcuts are not used on MAC OS X
// shortcuts are not used on OS X
#ifndef Q_OS_MAC
void tst_QMessageBox::shortcut()
{
@ -483,7 +483,7 @@ void tst_QMessageBox::instanceSourceCompat()
QCOMPARE(exec(&mb, Qt::Key_Enter), int(QMessageBox::Yes));
QCOMPARE(exec(&mb, Qt::Key_Escape), int(QMessageBox::Cancel));
#ifndef Q_OS_MAC
// mnemonics are not used on Mac OS X
// mnemonics are not used on OS X
QCOMPARE(exec(&mb, Qt::ALT + Qt::Key_R), 0);
QCOMPARE(exec(&mb, Qt::ALT + Qt::Key_Z), 1);
#endif

2
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -2683,7 +2683,7 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState()
view.viewport()->repaint();
#ifdef Q_OS_MAC
// Repaint on Mac OS X actually does require spinning the event loop.
// Repaint on OS X actually does require spinning the event loop.
QTest::qWait(100);
#endif
QVERIFY(!parent->dirtyPainter);

2
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
View File

@ -850,7 +850,7 @@ void tst_QTreeView::editTriggers()
case QAbstractItemView::EditKeyPressed:
view.setFocus();
#ifdef Q_OS_MAC
// Mac OS X uses Enter for editing
// OS X uses Enter for editing
QTest::keyPress(&view, Qt::Key_Enter);
#else
// All other platforms use F2

2
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -1302,7 +1302,7 @@ void DeleteLaterWidget::checkDeleteLater()
void tst_QApplication::testDeleteLater()
{
#ifdef Q_OS_MAC
QSKIP("This test fails and then hangs on Mac OS X, see QTBUG-24318");
QSKIP("This test fails and then hangs on OS X, see QTBUG-24318");
#endif
int argc = 0;
QApplication app(argc, 0);

2
tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
View File

@ -187,7 +187,7 @@ void tst_QLabel::cleanup()
}
}
// Set buddy doesn't make much sense on Mac OS X
// Set buddy doesn't make much sense on OS X
#ifndef Q_OS_MAC
void tst_QLabel::setBuddy()
{

2
tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
View File

@ -100,7 +100,7 @@ void tst_QScrollBar::scrollSingleStep()
QTest::qWait(510); // initial delay is 500 for setRepeatAction
disconnect(&testWidget, &QAbstractSlider::actionTriggered, &testWidget, &SingleStepTestScrollBar::hideAndShow);
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "This test fails on Mac OS X, see QTBUG-25272", Abort);
QEXPECT_FAIL("", "This test fails on OS X, see QTBUG-25272", Abort);
#endif
QCOMPARE(testWidget.value(), testWidget.singleStep());
}