path: root/src/corelib/doc
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/doc
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/doc')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc
index 91ce8afcf8..b7f84f5b5e 100644
--- a/src/corelib/doc/src/resource-system.qdoc
+++ b/src/corelib/doc/src/resource-system.qdoc
@@ -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