diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-02-18 14:49:44 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-03-31 12:49:01 +0000 |
commit | 19a91b4a3531d331362fcefd87c43366ae142f57 (patch) | |
tree | e1e1b50ab8cc8198d955eb3697730e69dd199669 /src/corelib/global/qcompilerdetection.h | |
parent | 180ee8a8de459b752f739e1a9d56d271303d0302 (diff) |
Doc: Fix using Apple-related terminology in Qt Core
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>
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
-rw-r--r-- | src/corelib/global/qcompilerdetection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index d144c4faad..3b9b7934bc 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -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. |