Merge 1.6 into master

Change-Id: Ie98233d955f3695da0b20069fb2317931e353e4e

1 files changed, 7 insertions, 0 deletions

diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index e8994c76c..160ee977f 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -319,6 +319,13 @@
         \li determined by qbs-setup-toolchains
         \li Full path of the linker binary. This is set in the build profile.
     \row
+        \li linkerWrapper
+        \li \c{stringList}
+        \li 1.6.2
+        \li \c{undefined}
+        \li Wrapper binary and its arguments for wrapping linker calls.
+            This is useful for linker wrappers as needed by Bullseye Coverage, for example.
+    \row
         \li entryPoint
         \li \c{string}
         \li 1.3