diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp index 52875bc9fe..fb6c9bd3a0 100644 --- a/src/corelib/tools/qelapsedtimer.cpp +++ b/src/corelib/tools/qelapsedtimer.cpp @@ -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. 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 diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 8f3db74131..5685e92447 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -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 |