Merge remote-tracking branch 'origin/1.1'

Change-Id: I7475c4a71c15c83c59400c44ef96d73d15caea58

1 files changed, 19 insertions, 1 deletions

diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index f5a05425f..564ca7e24 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -322,7 +322,7 @@
     \row    \li \b{Default:}         \li determined by qbs-detect-toolchains
     \endtable
 
-    Directory where the compiler binary is located. This is set in the build profile.
+    Full path of the compiler binary. This is set in the build profile.
 
     \section2 compilerWrapper
 
@@ -334,6 +334,24 @@
     Wrapper binary and its arguments for wrapping compiler calls.
     This is useful for compiler wrappers like ccache and alike.
 
+    \section2 linkerName
+
+    \table
+    \row    \li \b{Type:}            \li \c{string}
+    \row    \li \b{Default:}         \li determined by qbs-detect-toolchains
+    \endtable
+
+    Name of the linker binary. This is set in the build profile.
+
+    \section2 linkerPath
+
+    \table
+    \row    \li \b{Type:}            \li \c{string}
+    \row    \li \b{Default:}         \li determined by qbs-detect-toolchains
+    \endtable
+
+    Full path of the linker binary. This is set in the build profile.
+
     \section2 supportedStaticLibrarySuffixes
 
     \table