Merge remote-tracking branch 'origin/5.10' into 5.11

Change-Id: I7d356c3beedfcfaf9d6ae88ed1cf10bf9faaac7f

1 files changed, 21 insertions, 0 deletions

diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index 8d758dd43..5505a44bf 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -1147,7 +1147,28 @@
     \row
         \li \c{-qmldir=<path>}
         \li Deploy imports used by .qml files in the given path
+    \row
+        \li \c{-always-overwrite}
+        \li Copy files even if the target file exists
+    \row
+        \li \c{-codesign=<ident>}
+        \li Run \c codesign with the given identity on all executables
+    \row
+        \li \c{-appstore-compliant}
+        \li Skip deployment of components that use private API
+    \row
+        \li \c{-libpath=<path>}
+        \li Add the given path to the library search path
+    \row
+        \li \c{-fs=<filesystem>}
+        \li Set the filesystem used for the .dmg disk image (defaults to HFS+)
     \endtable
+
+    \note macOS High Sierra introduced the new Apple File System (APFS). Older
+    versions of macOS cannot read .dmg files that are formatted with APFS. By
+    default, \c macdeployqt uses the older HFS+ file system for compatibility
+    with all versions of macOS currently supported by Qt. Use the \c{-fs} option
+    to specify a different file system.
 */
 
 /*!