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/tools/qstring.cpp | |
| 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/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 9921d5cfbb..189caf8bd7 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -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 |