Merge 1.6 into master

Change-Id: Id711e244f207d6c4f08e240ef4c033f344b530fc

1 files changed, 10 insertions, 1 deletions

diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index 330fc3455..a9c2464f3 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -169,6 +169,13 @@
         \li \c{"all"}
         \li Specifies the warning level for the compiler - \c{"none"} or \c{"all"}.
     \row
+        \li driverFlags
+        \li \c{stringList}
+        \li 1.6
+        \li undefined
+        \li Flags that are added to all compilation and linking commands performed by the compiler
+            driver, independently of the language.
+    \row
         \li commonCompilerFlags
         \li \c{stringList}
         \li 1.0.1
@@ -260,7 +267,9 @@
         \li \c{stringList}
         \li 1.0
         \li undefined
-        \li Additional flags for the linker.
+        \li Additional flags for the linker. These flags should \e not be escaped using the -Wl or
+            -Xlinker syntaxes, as \QBS will do this automatically based on the linker being used.
+            See cpp.linkerMode for additional information.
     \row
         \li assemblerName
         \li \c{string}