summaryrefslogtreecommitdiff
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-08-12 10:27:36 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-15 07:10:10 +0000
commit5eab543c5c955f5057225b9bdb6b2757516dbd3e (patch)
tree1b4245b8aa7da6c145bd51283566a3fc781d9af4 /src/declarative/qml
parente90625f00a3727ca1c89a94407b7686327d03c19 (diff)
downloadqtquick1-5eab543c5c955f5057225b9bdb6b2757516dbd3e.tar.gz
Doc: Change instances of 'OS X' to 'macOS'5.6.2
As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iec248314791d9dbb1ab11959121376265cefd7fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativeimport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 9df5dc4a..0da608bc 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -840,7 +840,7 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const
\row \li Unix/Linux \li \c .so
\row \li AIX \li \c .a
\row \li HP-UX \li \c .sl, \c .so (HP-UXi)
- \row \li OS X \li \c .dylib, \c .bundle, \c .so
+ \row \li \macos \li \c .dylib, \c .bundle, \c .so
\endtable
Version number on unix are ignored.