path: root/src/corelib/tools/qtimezone.cpp
diff options
authorAlexander Volkov <>2015-02-18 14:49:44 +0300
committerAlexander Volkov <>2015-03-31 12:49:01 +0000
commit19a91b4a3531d331362fcefd87c43366ae142f57 (patch)
treee1e1b50ab8cc8198d955eb3697730e69dd199669 /src/corelib/tools/qtimezone.cpp
parent180ee8a8de459b752f739e1a9d56d271303d0302 (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 <> Reviewed-by: Venugopal Shivashankar <> Reviewed-by: Topi Reiniƶ <>
Diffstat (limited to 'src/corelib/tools/qtimezone.cpp')
1 files changed, 1 insertions, 1 deletions
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