Merge remote-tracking branch 'origin/1.1'

Change-Id: I2c4aa7cb7ec7db58577ceac5cb56bc925ae9360f

1 files changed, 18 insertions, 0 deletions

diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index c13f8ae64..c4e7c92f0 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -515,6 +515,24 @@
 
     \section1 Properties Specific to Unix Platforms
 
+    \section2 archiverName
+
+    \table
+    \row    \li \b{Type:}            \li \c{string}
+    \row    \li \b{Default:}         \li \c{"ar"}
+    \endtable
+
+    Name of the archiver binary. This is set in the build profile.
+
+    \section2 archiverPath
+
+    \table
+    \row    \li \b{Type:}            \li \c{string}
+    \row    \li \b{Default:}         \li determined by qbs-detect-toolchains
+    \endtable
+
+    Full path of the archiver binary. This is set in the build profile.
+
     \section2 positionIndependentCode
 
     \table