Merge branch 1.17 into master

Change-Id: Ibdf2afb9f05682e0624540af22330abc8580bafb

3 files changed, 11 insertions, 7 deletions

diff --git a/doc/reference/items/probe/path-probe.qdoc b/doc/reference/items/probe/path-probe.qdoc
index df5fbb22f..b7749f09d 100644
--- a/doc/reference/items/probe/path-probe.qdoc
+++ b/doc/reference/items/probe/path-probe.qdoc
@@ -37,10 +37,11 @@
     locations.
 
     PathProbe takes as input lists of paths to search files from and file name patterns. The paths
-    are specified by using the searchPaths, platformSearchPaths, environmentPaths, and
-    platformEnvironmentPaths properties. The file name patterns are specified by the \l names and
-    nameSuffixes properties. Returns the first file that matches the file name patterns. If no such
-    file is found, the \l {Probe::found}{probe.found} property is set to \c false.
+    are specified by using the environmentPaths, searchPaths, platformEnvironmentPaths and
+    platformSearchPaths properties; the path are searched in the same order as listed. The file
+    name patterns are specified by the \l names and nameSuffixes properties. Returns the first file
+    that matches the file name patterns. If no such file is found, the
+    \l {Probe::found}{probe.found} property is set to \c false.
 
     For example, a simple PathProbe that searches for the stdio.h header can be used as follows:
 
diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc
index e92359377..da9996b85 100644
--- a/doc/reference/modules/cpp-module.qdoc
+++ b/doc/reference/modules/cpp-module.qdoc
@@ -1845,9 +1845,7 @@
     \qmlproperty bool cpp::generateCompilerListingFiles
     \since Qbs 1.15
 
-    \baremetalproperty
-
-    Whether to auto-generate a compiler listing files.
+    Whether to auto-generate compiler listing files.
 
     \defaultvalue \c{false}
 */
diff --git a/doc/reference/modules/qbs-module.qdoc b/doc/reference/modules/qbs-module.qdoc
index e72df697c..874e006e8 100644
--- a/doc/reference/modules/qbs-module.qdoc
+++ b/doc/reference/modules/qbs-module.qdoc
@@ -274,10 +274,15 @@
         \li \c{"windows"}
         \li \c{["windows"]}
     \row
+        \li \c{"none"}
+        \li \c{["none"]}
+    \row
         \li \c{undefined}
         \li \c{[]}
     \endtable
 
+    \note The "none" value is usually used for a bare-metal platforms.
+
     \sa {Target Platforms}
 
     \defaultvalue \l{qbs::hostPlatform}{hostPlatform}