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

Doc: Fix using Apple-related terminology in Qt Core

Browse Source 
Use the name "OS X" instead of "Mac OS X", "Mac OS" and "OSX",
and mention iOS. Replace "Carbon Preferences API" by
"CFPreferences API" in the QSettings documentation.

Change-Id: Ia7f9fb874276c7c445a1649df521b96ff43daa0c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
This commit is contained in:
Alexander Volkov 2015-02-18 14:49:44 +03:00
parent 180ee8a8de
commit 19a91b4a35
25 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/doc/src/resource-system.qdoc
View File

@ -136,7 +136,7 @@
\image resources.png Building resources into an application
Currently, Qt always stores the data directly in the executable,
even on Windows and Mac OS X, where the operating system provides
even on Windows, OS X, and iOS, where the operating system provides
native support for resources. This might change in a future Qt
release.

4
src/corelib/global/qcompilerdetection.h
View File

@ -902,7 +902,7 @@
# endif // Q_OS_QNX
# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
&& ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
// Mac OS X: Apple has not updated libstdc++ since 2007, which means it does not have
// Apple has not updated libstdc++ since 2007, which means it does not have
// <initializer_list> or std::move. Let's disable these features
# undef Q_COMPILER_INITIALIZER_LISTS
# undef Q_COMPILER_RVALUE_REFS
@ -918,7 +918,7 @@
# endif
# endif
# if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC)
// Mac OS X: Apple's low-level implementation of the C++ support library
// Apple's low-level implementation of the C++ support library
// (libc++abi.dylib, shared between libstdc++ and libc++) has deadlocks. The
// C++11 standard requires the deadlocks to be removed, so this will eventually
// be fixed; for now, let's disable this.

50
src/corelib/global/qnamespace.qdoc
View File

@ -111,7 +111,7 @@
shown in any menus unless specifically set by the
QAction::iconVisibleInMenu property.
Menus that are currently open or menus already created in the native
Mac OS X menubar \e{may not} pick up a change in this attribute. Changes
OS X menubar \e{may not} pick up a change in this attribute. Changes
in the QAction::iconVisibleInMenu property will always be picked up.
\value AA_NativeWindows Ensures that widgets have native windows.
@ -129,9 +129,9 @@
\value AA_DontUseNativeMenuBar All menubars created while this attribute is
set to true won't be used as a native menubar (e.g, the menubar at
the top of the main screen on Mac OS X or at the bottom in Windows CE).
the top of the main screen on OS X or at the bottom in Windows CE).
\value AA_MacDontSwapCtrlAndMeta On Mac OS X by default, Qt swaps the
\value AA_MacDontSwapCtrlAndMeta On OS X by default, Qt swaps the
Control and Meta (Command) keys (i.e., whenever Control is pressed, Qt
sends Meta, and whenever Meta is pressed Control is sent). When this
attribute is true, Qt will not do the flip. \l QKeySequence::StandardKey
@ -294,7 +294,7 @@
\omitvalue KeyboardModifierMask
\note On Mac OS X, the \c ControlModifier value corresponds to
\note On OS X, the \c ControlModifier value corresponds to
the Command keys on the Macintosh keyboard, and the \c MetaModifier value
corresponds to the Control keys. The \c KeypadModifier value will also be set
when an arrow key is pressed as the arrow keys are considered part of the
@ -312,7 +312,7 @@
This enum provides shorter names for the keyboard modifier keys
supported by Qt.
\note On Mac OS X, the \c CTRL value corresponds to
\note On OS X, the \c CTRL value corresponds to
the Command keys on the Macintosh keyboard, and the \c META value
corresponds to the Control keys.
@ -913,34 +913,34 @@
\value WA_MacOpaqueSizeGrip Indicates that the native Carbon size grip
should be opaque instead of transparent (the default). This attribute
is only applicable to Mac OS X and is set by the widget's author.
is only applicable to OS X and is set by the widget's author.
\value WA_MacShowFocusRect Indicates that this widget should get a
QFocusFrame around it. Some widgets draw their own focus halo
regardless of this attribute. Not that the QWidget::focusPolicy
also plays the main role in whether something is given focus or
not, this only controls whether or not this gets the focus
frame. This attribute is only applicable to Mac OS X.
frame. This attribute is only applicable to OS X.
\value WA_MacNormalSize Indicates the widget should have the
normal size for widgets in Mac OS X. This attribute is only
applicable to Mac OS X.
normal size for widgets in OS X. This attribute is only
applicable to OS X.
\value WA_MacSmallSize Indicates the widget should have the small
size for widgets in Mac OS X. This attribute is only applicable to
Mac OS X.
size for widgets in OS X. This attribute is only applicable to
OS X.
\value WA_MacMiniSize Indicates the widget should have the mini
size for widgets in Mac OS X. This attribute is only applicable to
Mac OS X.
size for widgets in OS X. This attribute is only applicable to
OS X.
\value WA_MacVariableSize Indicates the widget can choose between
alternative sizes for widgets to avoid clipping.
This attribute is only applicable to Mac OS X.
This attribute is only applicable to OS X.
\value WA_MacBrushedMetal Indicates the widget should be drawn in
the brushed metal style as supported by the windowing system. This
attribute is only applicable to Mac OS X.
attribute is only applicable to OS X.
\omitvalue WA_MacMetalStyle
@ -1090,14 +1090,14 @@
\b Warning: This flag must \e never be set or cleared by the widget's author.
\value WA_WindowModified Indicates that the window is marked as modified.
On some platforms this flag will do nothing, on others (including Mac OS X
On some platforms this flag will do nothing, on others (including OS X
and Windows) the window will take a modified appearance. This flag is set
or cleared by QWidget::setWindowModified().
\value WA_WindowPropagation Makes a toplevel window inherit font and
palette from its parent.
\value WA_MacAlwaysShowToolWindow On Mac OS X, show the tool window even
\value WA_MacAlwaysShowToolWindow On OS X, show the tool window even
when the application is not active. By default, all tool windows are
hidden when the application is inactive.
@ -1280,8 +1280,8 @@
\value Key_PageUp
\value Key_PageDown
\value Key_Shift
\value Key_Control On Mac OS X, this corresponds to the Command keys.
\value Key_Meta On Mac OS X, this corresponds to the Control keys.
\value Key_Control On OS X, this corresponds to the Command keys.
\value Key_Meta On OS X, this corresponds to the Control keys.
On Windows keyboards, this key is mapped to the
Windows key.
\value Key_Alt
@ -1919,7 +1919,7 @@
\value TabFocus the widget accepts focus by tabbing.
\value ClickFocus the widget accepts focus by clicking.
\value StrongFocus the widget accepts focus by both tabbing
and clicking. On Mac OS X this will also
and clicking. On OS X this will also
be indicate that the widget accepts tab focus
when in 'Text/List focus mode'.
\value WheelFocus like Qt::StrongFocus plus the widget accepts
@ -2012,7 +2012,7 @@
system supports it, a tool window can be decorated
with a somewhat lighter frame. It can also be
combined with Qt::FramelessWindowHint.
On Mac OS X, tool windows correspond to the
On OS X, tool windows correspond to the
\l{http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/hitb-wind_cont_concept/chapter_2_section_2.html}{Floating}
class of windows. This means that the window lives on a
level above normal windows; it impossible to put a normal
@ -2101,10 +2101,10 @@
\value WindowContextHelpButtonHint Adds a context help button to dialogs.
On some platforms this implies Qt::WindowSystemMenuHint for it to work.
\value MacWindowToolBarButtonHint On Mac OS X adds a tool bar button (i.e.,
\value MacWindowToolBarButtonHint On OS X adds a tool bar button (i.e.,
the oblong button that is on the top right of windows that have toolbars).
\value WindowFullscreenButtonHint On Mac OS X adds a fullscreen button.
\value WindowFullscreenButtonHint On OS X adds a fullscreen button.
\value BypassGraphicsProxyWidget Prevents the window and its children from
automatically embedding themselves into a QGraphicsProxyWidget if the
@ -2128,7 +2128,7 @@
that support _NET_WM_STATE_BELOW atom. If a window always
on the bottom has a parent, the parent will also be left on
the bottom. This window hint is currently not implemented
for Mac OS X.
for OS X.
\value WindowOkButtonHint Adds an OK button to the window decoration of a dialog.
Only supported for Windows CE.
@ -2912,7 +2912,7 @@
\value CoarseTimer Coarse timers try to keep accuracy within 5% of the desired interval
\value VeryCoarseTimer Very coarse timers only keep full second accuracy
On UNIX (including Linux and Mac OS X), Qt will keep millisecond accuracy
On UNIX (including Linux, OS X, and iOS), Qt will keep millisecond accuracy
for Qt::PreciseTimer. For Qt::CoarseTimer, the interval will be adjusted up
to 5% to align the timer with other timers that are expected to fire at or
around the same time. The objective is to make most timers wake up at the

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

@ -299,7 +299,7 @@ QAbstractFileEngine *QAbstractFileEngine::create(const QString &fileName)
the file system (i.e. not a file or directory).
\value FileType The file is a regular file to the file system
(i.e. not a link or directory)
\value BundleType The file is a Mac OS X bundle implies DirectoryType
\value BundleType OS X and iOS: the file is a bundle; implies DirectoryType
\value DirectoryType The file is a directory in the file system
(i.e. not a link or file).

4
src/corelib/io/qdir.cpp
View File

@ -1818,8 +1818,8 @@ QFileInfoList QDir::drives()
}
/*!
Returns the native directory separator: "/" under Unix (including
Mac OS X) and "\\" under Windows.
Returns the native directory separator: "/" under Unix
and "\\" under Windows.
You do not need to use this function to build file paths. If you
always use "/", Qt will translate your paths to conform to the

4
src/corelib/io/qfile.cpp
View File

@ -199,9 +199,9 @@ QAbstractFileEngine *QFilePrivate::engine() const
\section1 Platform Specific Issues
File permissions are handled differently on Linux/Mac OS X and
File permissions are handled differently on Unix-like systems and
Windows. In a non \l{QIODevice::isWritable()}{writable}
directory on Linux, files cannot be created. This is not always
directory on Unix-like systems, files cannot be created. This is not always
the case on Windows, where, for instance, the 'My Documents'
directory usually is not writable, but it is still possible to
create files in it.

8
src/corelib/io/qfileinfo.cpp
View File

@ -234,7 +234,7 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)
isSymLink(). The symLinkTarget() function provides the name of the file
the symlink points to.
On Unix (including Mac OS X), the symlink has the same size() has
On Unix (including OS X and iOS), the symlink has the same size() has
the file it points to, because Unix handles symlinks
transparently; similarly, opening a symlink using QFile
effectively opens the link's target. For example:
@ -753,7 +753,7 @@ QString QFileInfo::fileName() const
\since 4.3
Returns the name of the bundle.
On Mac OS X this returns the proper localized name for a bundle if the
On OS X and iOS this returns the proper localized name for a bundle if the
path isBundle(). On all other platforms an empty QString is returned.
Example:
@ -1029,7 +1029,7 @@ bool QFileInfo::isDir() const
/*!
\since 4.3
Returns \c true if this object points to a bundle or to a symbolic
link to a bundle on Mac OS X; otherwise returns \c false.
link to a bundle on OS X and iOS; otherwise returns \c false.
\sa isDir(), isSymLink(), isFile()
*/
@ -1050,7 +1050,7 @@ bool QFileInfo::isBundle() const
Returns \c true if this object points to a symbolic link (or to a
shortcut on Windows); otherwise returns \c false.
On Unix (including Mac OS X), opening a symlink effectively opens
On Unix (including OS X and iOS), opening a symlink effectively opens
the \l{symLinkTarget()}{link's target}. On Windows, it opens the \c
.lnk file itself.

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

@ -323,7 +323,7 @@ void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry)
}
}
#elif defined(_DIRENT_HAVE_D_TYPE) || defined(Q_OS_BSD4)
// BSD4 includes Mac OS X
// BSD4 includes OS X and iOS
// ### This will clear all entry flags and knownFlagsMask
switch (entry.d_type)

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

@ -412,7 +412,7 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
what |= QFileSystemMetaData::DirectoryType;
}
if (what & QFileSystemMetaData::HiddenAttribute) {
// Mac OS >= 10.5: st_flags & UF_HIDDEN
// OS X >= 10.5: st_flags & UF_HIDDEN
what |= QFileSystemMetaData::PosixStatFlags;
}
#endif // defined(Q_OS_MACX)

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. Mac OS X 10.5 and up use a different backend and do not
the total. OS X 10.5 and up use a different backend and do not
suffer from this issue.

4
src/corelib/io/qfsfileengine.cpp
View File

@ -603,7 +603,7 @@ qint64 QFSFileEnginePrivate::readFdFh(char *data, qint64 len)
result = fread(data + readBytes, 1, size_t(len - readBytes), fh);
eof = feof(fh);
if (retry && eof && result == 0) {
// On Mac OS, this is needed, e.g., if a file was written to
// On OS X, this is needed, e.g., if a file was written to
// through another stream since our last read. See test
// tst_QFile::appendAndRead
QT_FSEEK(fh, QT_FTELL(fh), SEEK_SET); // re-sync stream.
@ -875,7 +875,7 @@ bool QFSFileEngine::supportsExtension(Extension extension) const
/*! \fn QFileInfoList QFSFileEngine::drives()
For Windows, returns the list of drives in the file system as a list
of QFileInfo objects. On unix, Mac OS X and Windows CE, only the
of QFileInfo objects. On Unix and Windows CE, only the
root path is returned. On Windows, this function returns all drives
(A:\, C:\, D:\, etc.).

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

@ -669,7 +669,7 @@ bool QIODevice::seek(qint64 pos)
For some devices, atEnd() can return true even though there is more data
to read. This special case only applies to devices that generate data in
direct response to you calling read() (e.g., \c /dev or \c /proc files on
Unix and Mac OS X, or console input / \c stdin on all platforms).
Unix and OS X, or console input / \c stdin on all platforms).
\sa bytesAvailable(), read(), isSequential()
*/

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

@ -102,7 +102,7 @@ static QBasicAtomicInt fcntlOK = Q_BASIC_ATOMIC_INITIALIZER(-1);
/*!
\internal
Checks that the OS isn't using POSIX locks to emulate flock().
Mac OS X is one of those.
OS X is one of those.
*/
static bool fcntlWorksAfterFlock()
{

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

@ -159,7 +159,7 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift)
by QStandardPaths::GenericConfigLocation, e.g.
\list
\li on Mac OS X: \c ~/Library/Preferences
\li on OS X and iOS: \c ~/Library/Preferences
\li on Unix: \c ~/.config, \c /etc/xdg
\li on Windows: \c %LOCALAPPDATA%, \c %ProgramData%,
\l QCoreApplication::applicationDirPath(),

42
src/corelib/io/qsettings.cpp
View File

@ -1916,7 +1916,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
Users normally expect an application to remember its settings
(window sizes and positions, options, etc.) across sessions. This
information is often stored in the system registry on Windows,
and in XML preferences files on Mac OS X. On Unix systems, in the
and in property list files on OS X and iOS. On Unix systems, in the
absence of a standard, many applications (including the KDE
applications) use INI text files.
@ -1961,8 +1961,8 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\snippet settings/settings.cpp 4
(Here, we also specify the organization's Internet domain. When
the Internet domain is set, it is used on Mac OS X instead of the
organization name, since Mac OS X applications conventionally use
the Internet domain is set, it is used on OS X and iOS instead of the
organization name, since OS X and iOS applications conventionally use
Internet domains to identify themselves. If no domain is set, a
fake domain is derived from the organization name. See the
\l{Platform-Specific Notes} below for details.)
@ -2020,7 +2020,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
Setting keys can contain any Unicode characters. The Windows
registry and INI files use case-insensitive keys, whereas the
Carbon Preferences API on Mac OS X uses case-sensitive keys. To
CFPreferences API on OS X and iOS uses case-sensitive keys. To
avoid portability problems, follow these simple rules:
\list 1
@ -2223,7 +2223,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
in the application's home directory.
If the file format is IniFormat, the following files are
used on Unix and Mac OS X:
used on Unix, OS X, and iOS:
\list 1
\li \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini})
@ -2251,7 +2251,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
in the application's home directory.
The paths for the \c .ini and \c .conf files can be changed using
setPath(). On Unix and Mac OS X, the user can override them by
setPath(). On Unix, OS X, and iOS the user can override them by
setting the \c XDG_CONFIG_HOME environment variable; see
setPath() for details.
@ -2268,7 +2268,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
You can then use the QSettings object to read and write settings
in the file.
On Mac OS X, you can access XML-based \c .plist files by passing
On OS X and iOS, you can access property list \c .plist files by passing
QSettings::NativeFormat as second argument. For example:
\snippet code/src_corelib_io_qsettings.cpp 3
@ -2322,13 +2322,13 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
limitations is to store the settings using the IniFormat
instead of the NativeFormat.
\li On Mac OS X, allKeys() will return some extra keys for global
\li On OS X and iOS, allKeys() will return some extra keys for global
settings that apply to all applications. These keys can be
read using value() but cannot be changed, only shadowed.
Calling setFallbacksEnabled(false) will hide these global
settings.
\li On Mac OS X, the CFPreferences API used by QSettings expects
\li On OS X and iOS, the CFPreferences API used by QSettings expects
Internet domain names rather than organization names. To
provide a uniform API, QSettings derives a fake domain name
from the organization name (unless the organization name
@ -2345,7 +2345,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\snippet code/src_corelib_io_qsettings.cpp 7
\li On Mac OS X, permissions to access settings not belonging to the
\li On OS X, permissions to access settings not belonging to the
current user (i.e. SystemScope) have changed with 10.7 (Lion). Prior to
that version, users having admin rights could access these. For 10.7 and
10.8 (Mountain Lion), only root can. However, 10.9 (Mavericks) changes
@ -2385,7 +2385,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\value NativeFormat Store the settings using the most
appropriate storage format for the platform.
On Windows, this means the system registry;
on Mac OS X, this means the CFPreferences
on OS X and iOS, this means the CFPreferences
API; on Unix, this means textual
configuration files in INI format.
\value IniFormat Store the settings in INI files.
@ -2548,7 +2548,7 @@ QSettings::QSettings(Format format, Scope scope, const QString &organization,
If \a format is QSettings::NativeFormat, the meaning of \a
fileName depends on the platform. On Unix, \a fileName is the
name of an INI file. On Mac OS X, \a fileName is the name of a
name of an INI file. On OS X and iOS, \a fileName is the name of a
\c .plist file. On Windows, \a fileName is a path in the system
registry.
@ -2601,7 +2601,7 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent)
called, the QSettings object will not be able to read or write
any settings, and status() will return AccessError.
On Mac OS X, if both a name and an Internet domain are specified
On OS X and iOS, if both a name and an Internet domain are specified
for the organization, the domain is preferred over the name. On
other platforms, the name is preferred over the domain.
@ -3117,7 +3117,7 @@ bool QSettings::isWritable() const
exists, the previous value is overwritten.
Note that the Windows registry and INI files use case-insensitive
keys, whereas the Carbon Preferences API on Mac OS X uses
keys, whereas the CFPreferences API on OS X and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@ -3156,7 +3156,7 @@ void QSettings::setValue(const QString &key, const QVariant &value)
\snippet code/src_corelib_io_qsettings.cpp 25
Note that the Windows registry and INI files use case-insensitive
keys, whereas the Carbon Preferences API on Mac OS X uses
keys, whereas the CFPreferences API on OS X and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@ -3191,7 +3191,7 @@ void QSettings::remove(const QString &key)
relative to that group.
Note that the Windows registry and INI files use case-insensitive
keys, whereas the Carbon Preferences API on Mac OS X uses
keys, whereas the CFPreferences API on OS X and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@ -3253,7 +3253,7 @@ bool QSettings::event(QEvent *event)
returned.
Note that the Windows registry and INI files use case-insensitive
keys, whereas the Carbon Preferences API on Mac OS X uses
keys, whereas the CFPreferences API on OS X and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@ -3356,18 +3356,18 @@ void QSettings::setUserIniPath(const QString &dir)
\row \li SystemScope \li \c /etc/xdg
\row \li{1,2} Qt for Embedded Linux \li{1,2} NativeFormat, IniFormat \li UserScope \li \c $HOME/Settings
\row \li SystemScope \li \c /etc/xdg
\row \li{1,2} Mac OS X \li{1,2} IniFormat \li UserScope \li \c $HOME/.config
\row \li{1,2} OS X and iOS \li{1,2} IniFormat \li UserScope \li \c $HOME/.config
\row \li SystemScope \li \c /etc/xdg
\endtable
The default UserScope paths on Unix and Mac OS X (\c
The default UserScope paths on Unix, OS X, and iOS (\c
$HOME/.config or $HOME/Settings) can be overridden by the user by setting the
\c XDG_CONFIG_HOME environment variable. The default SystemScope
paths on Unix and Mac OS X (\c /etc/xdg) can be overridden when
paths on Unix, OS X, and iOS (\c /etc/xdg) can be overridden when
building the Qt library using the \c configure script's \c
-sysconfdir flag (see QLibraryInfo for details).
Setting the NativeFormat paths on Windows and Mac OS X has no
Setting the NativeFormat paths on Windows, OS X, and iOS has no
effect.
\warning This function doesn't affect existing QSettings objects.

4
src/corelib/kernel/qcoreapplication.cpp
View File

@ -663,7 +663,7 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p)
If you are doing graphical changes inside a loop that does not
return to the event loop on asynchronous window systems like X11
or double buffered window systems like Mac OS X, and you want to
or double buffered window systems like Quartz (OS X and iOS), and you want to
visualize these changes immediately (e.g. Splash Screens), call
this function.
@ -1975,7 +1975,7 @@ void QCoreApplicationPrivate::setApplicationFilePath(const QString &path)
directory, and you run the \c{regexp} example, this function will
return "C:/Qt/examples/tools/regexp".
On Mac OS X this will point to the directory actually containing the
On OS X and iOS this will point to the directory actually containing the
executable, which may be inside of an application bundle (if the
application is bundled).

4
src/corelib/kernel/qcoreevent.cpp
View File

@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE
\value NonClientAreaMouseButtonPress A mouse button press occurred outside the client area.
\value NonClientAreaMouseButtonRelease A mouse button release occurred outside the client area.
\value NonClientAreaMouseMove A mouse move occurred outside the client area.
\value MacSizeChange The user changed his widget sizes (Mac OS X only).
\value MacSizeChange The user changed his widget sizes (OS X only).
\value MetaCall An asynchronous method invocation via QMetaObject::invokeMethod().
\value ModifiedChange Widgets modification state has been changed.
\value MouseButtonDblClick Mouse press again (QMouseEvent).
@ -210,7 +210,7 @@ QT_BEGIN_NAMESPACE
\omitvalue ThemeChange
\value ThreadChange The object is moved to another thread. This is the last event sent to this object in the previous thread. See QObject::moveToThread().
\value Timer Regular timer events (QTimerEvent).
\value ToolBarChange The toolbar button is toggled on Mac OS X.
\value ToolBarChange The toolbar button is toggled on OS X.
\value ToolTip A tooltip was requested (QHelpEvent).
\value ToolTipChange The widget's tooltip has changed.
\value TouchBegin Beginning of a sequence of touch-screen or track-pad events (QTouchEvent).

2
src/corelib/kernel/qobject.cpp
View File

@ -1475,7 +1475,7 @@ void QObject::moveToThread(QThread *targetThread)
currentData->thread, d->threadData->thread, targetData ? targetData->thread : Q_NULLPTR);
#ifdef Q_OS_MAC
qWarning("On Mac OS X, you might be loading two sets of Qt binaries into the same process. "
qWarning("You might be loading two sets of Qt binaries into the same process. "
"Check that all plugins are compiled against the right Qt binaries. Export "
"DYLD_PRINT_LIBRARIES=1 and check that only one set of binaries are being loaded.");
#endif

2
src/corelib/mimetypes/qmimedatabase.cpp
View File

@ -237,7 +237,7 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
The MIME type database is provided by the freedesktop.org shared-mime-info
project. If the MIME type database cannot be found on the system, as is the case
on most Windows and Mac OS X systems, Qt will use its own copy of it.
on most Windows, OS X, and iOS systems, Qt will use its own copy of it.
Applications which want to define custom MIME types need to install an
XML file into the locations searched for MIME definitions.

8
src/corelib/plugin/qlibrary.cpp
View File

@ -594,7 +594,7 @@ bool QLibraryPrivate::loadPlugin()
\row \li Unix/Linux \li \c .so
\row \li AIX \li \c .a
\row \li HP-UX \li \c .sl, \c .so (HP-UXi)
\row \li Mac OS X \li \c .dylib, \c .bundle, \c .so
\row \li OS X and iOS \li \c .dylib, \c .bundle, \c .so
\endtable
Trailing versioning numbers on Unix are ignored.
@ -831,7 +831,7 @@ QLibrary::QLibrary(QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
".dylib" on OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, QObject *parent)
:QObject(parent), d(0), did_load(false)
@ -848,7 +848,7 @@ QLibrary::QLibrary(const QString& fileName, QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
".dylib" on OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
:QObject(parent), d(0), did_load(false)
@ -864,7 +864,7 @@ QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
".dylib" on Mac OS X, and ".dll" on Windows. (See \l{fileName}.)
".dylib" on OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, const QString &version, QObject *parent)
:QObject(parent), d(0), did_load(false)

2
src/corelib/plugin/qpluginloader.cpp
View File

@ -139,7 +139,7 @@ QPluginLoader::QPluginLoader(QObject *parent)
To be loadable, the file's suffix must be a valid suffix for a
loadable library in accordance with the platform, e.g. \c .so on
Unix, - \c .dylib on Mac OS X, and \c .dll on Windows. The suffix
Unix, - \c .dylib on OS X and iOS, and \c .dll on Windows. The suffix
can be verified with QLibrary::isLibrary().
\sa setFileName()

2
src/corelib/thread/qthread_unix.cpp
View File

@ -406,7 +406,7 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW
cores = (int)psd.psd_proc_cnt;
}
#elif defined(Q_OS_BSD4)
// FreeBSD, OpenBSD, NetBSD, BSD/OS, Mac OS X
// FreeBSD, OpenBSD, NetBSD, BSD/OS, OS X, iOS
size_t len = sizeof(cores);
int mib[2];
mib[0] = CTL_HW;

6
src/corelib/tools/qelapsedtimer.cpp
View File

@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE
\value SystemTime The human-readable system time. This clock is not monotonic.
\value MonotonicClock The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow.
\value TickCounter The system's tick counter, used on Windows systems. This clock may overflow.
\value MachAbsoluteTime The Mach kernel's absolute time (Mac OS X). This clock is monotonic and does not overflow.
\value MachAbsoluteTime The Mach kernel's absolute time (OS X and iOS). This clock is monotonic and does not overflow.
\value PerformanceCounter The high-resolution performance counter provided by Windows. This clock is monotonic and does not overflow.
\section2 SystemTime
@ -173,8 +173,8 @@ QT_BEGIN_NAMESPACE
\section2 MachAbsoluteTime
This clock type is based on the absolute time presented by Mach kernels,
such as that found on Mac OS X. This clock type is presented separately
from MonotonicClock since Mac OS X is also a Unix system and may support
such as that found on OS X. This clock type is presented separately
from MonotonicClock since OS X and iOS are also Unix systems and may support
a POSIX monotonic clock with values differing from the Mach absolute
time.

12
src/corelib/tools/qstring.cpp
View File

@ -5288,7 +5288,7 @@ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2,
platform-dependent manner. Use this function to present sorted
lists of strings to the user.
On Mac OS X since Qt 4.3, this function compares according the
On OS X and iOS this function compares according the
"Order for sorted lists" setting in the International preferences panel.
\sa compare(), QLocale
@ -7713,7 +7713,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
Constructs a new QString containing a copy of the \a string CFString.
\note this function is only available on Mac OS X and iOS.
\note this function is only available on OS X and iOS.
*/
/*! \fn CFStringRef QString::toCFString() const
@ -7722,7 +7722,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
Creates a CFString from a QString. The caller owns the CFString and is
responsible for releasing it.
\note this function is only available on Mac OS X and iOS.
\note this function is only available on OS X and iOS.
*/
/*! \fn QString QString::fromNSString(const NSString *string)
@ -7730,7 +7730,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
Constructs a new QString containing a copy of the \a string NSString.
\note this function is only available on Mac OS X and iOS.
\note this function is only available on OS X and iOS.
*/
/*! \fn NSString QString::toNSString() const
@ -7738,7 +7738,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
Creates a NSString from a QString. The NSString is autoreleased.
\note this function is only available on Mac OS X and iOS.
\note this function is only available on OS X and iOS.
*/
/*! \fn bool QString::isSimpleText() const
@ -8915,7 +8915,7 @@ QStringRef QStringRef::appendTo(QString *string) const
platform-dependent manner. Use this function to present sorted
lists of strings to the user.
On Mac OS X, this function compares according the
On OS X and iOS, this function compares according the
"Order for sorted lists" setting in the International prefereces panel.
\sa compare(), QLocale

2
src/corelib/tools/qtimezone.cpp
View File

@ -179,7 +179,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
given moment then you should use a Qt::TimeSpec of Qt::LocalTime.
The method systemTimeZoneId() returns the current system IANA time zone
ID which on OSX and Linux will always be correct. On Windows this ID is
ID which on Unix-like systems will always be correct. On Windows this ID is
translated from the Windows system ID using an internal translation
table and the user's selected country. As a consequence there is a small
chance any Windows install may have IDs not known by Qt, in which case