Merge 2.1 into master

Change-Id: I6176c269e1cb23e88179d6e53f1f2bf57a668176

4 files changed, 65 insertions, 14 deletions

diff --git a/doc/reference/items/convenience/appleapplicationdiskimage.qdoc b/doc/reference/items/convenience/appleapplicationdiskimage.qdoc
index 8db7bc4db..d1fa15052 100644
--- a/doc/reference/items/convenience/appleapplicationdiskimage.qdoc
+++ b/doc/reference/items/convenience/appleapplicationdiskimage.qdoc
@@ -77,10 +77,11 @@
 
     The base directory from which artifacts installed into the disk image will be copied.
     This directory is always considered to be relative to \l{qbs::installRoot}
-    {qbs.installRoot}.
+    {qbs.installRoot}/\l{qbs::installPrefix}
+    {qbs.installPrefix}.
     For example, if the application Example.app exists at
-    \c{qbs.installRoot/Applications/Example.app}, and the value of this property
-    is \c{"/Applications"}, the application will be located at\c{/Example.app}
+    \c{qbs.installRoot/qbs.installPrefix/Applications/Example.app}, and the value of this property
+    is \c{"/Applications"}, the application will be located at \c{/Example.app}
     relative to the disk image root. Therefore, its full path when the disk
     image is mounted would be something like \c{/Volumes/Example-1.0/Example.app}.
 
diff --git a/doc/reference/items/language/group.qdoc b/doc/reference/items/language/group.qdoc
index c9b6dd1cf..fa6784ca6 100644
--- a/doc/reference/items/language/group.qdoc
+++ b/doc/reference/items/language/group.qdoc
@@ -74,10 +74,13 @@
         }
     }
     \endcode
-    When specifying files, you can use the wildcards "*", "?" and "[]", which have their usual meaning.
-    By default, matching files are only picked up directly from the parent directory, but you can tell \QBS to
-    consider the whole directory tree. It is also possible to exclude certain files from the list.
-    The pattern ** used in a pathname expansion context will match all files and zero or more
+    When specifying files, you can use the wildcards \c "*", \c "?" and \c "[]", which
+    have their
+    \l{https://en.wikipedia.org/wiki/Wildcard_character#File_and_directory_patterns}{usual meaning}
+    as in Unix Shell. By default, matching files are only picked up directly from the
+    parent directory, but you can tell \QBS to consider the whole directory tree.
+    It is also possible to exclude certain files from the list.
+    The pattern \c "**" used in a pathname expansion context will match all files and zero or more
     directories and subdirectories.
     For example:
     \snippet reference/items/language/group.qbs 0
@@ -114,13 +117,15 @@
 */
 
 /*!
-    \qmlproperty list Group::files
+    \qmlproperty pathList Group::files
 
     The files in the group. Mutually exclusive with \l{fileTagsFilter}.
     Relative paths are resolved using the parent directory of the file
     that contains the Group item. However, if the \l{prefix} property is set to
     an absolute path, then that one becomes the base directory.
 
+    The values can contain wildcards.
+
     \defaultvalue An empty list
 */
 
@@ -146,7 +151,7 @@
 */
 
 /*!
-    \qmlproperty list Group::fileTagsFilter
+    \qmlproperty stringList Group::fileTagsFilter
 
     List of \l{Artifact::fileTags}{artifact.fileTags} to match. Any properties
     set in this group will be applied to the product's artifacts whose file tags
@@ -170,7 +175,7 @@
 */
 
 /*!
-    \qmlproperty list Group::fileTags
+    \qmlproperty stringList Group::fileTags
 
     A list of file tags to attach to the group's files. These can then be
     matched by a \l{Rule}{rule}.
@@ -196,10 +201,13 @@
 */
 
 /*!
-    \qmlproperty list Group::excludeFiles
+    \qmlproperty pathList Group::excludeFiles
+
+    A list of files that are \e subtracted from the \l{files} list.
 
-    A list of files that are \e subtracted from the files list. Useful when
-    using wildcards.
+    The values can contain wildcards.
+
+    This property is ignored if \l{fileTagsFilter} is set.
 
     \defaultvalue An empty list
 */
diff --git a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
index e48be1633..461536fbc 100644
--- a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
+++ b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
@@ -100,7 +100,7 @@
     Setting this property to \c undefined or empty (\c "") value will use pkg-config's default
     search paths:
     \code
-        qbs build module-providers.pkgconfig.sysroot:undefined
+        qbs resolve moduleProviders.qbspkgconfig.sysroot:undefined
     \endcode
 
     This property is the equivalent of the \c{PKG_CONFIG_SYSROOT_DIR} variable for the
diff --git a/doc/reference/modules/qt-core-module.qdoc b/doc/reference/modules/qt-core-module.qdoc
index afc4a0f11..2211c4be6 100644
--- a/doc/reference/modules/qt-core-module.qdoc
+++ b/doc/reference/modules/qt-core-module.qdoc
@@ -211,6 +211,32 @@
 */
 
 /*!
+    \qmlproperty string Qt.core::generatedHeadersDir
+
+    The directory where tools that generate headers (such as \c moc or \c uic) put resulting
+    files.
+
+    Normally, you don't need to change this property. The one use-case is when there are several
+    files with the same file name in the Product. The file name produced by \c moc is based
+    only on the source file's base file name (without the directory path) which leads to a conflict
+    in the mentioned case. You can resolve the conflict by setting this property to a non-default
+    value for one of the files. For example:
+
+    \code
+        QtApplication {
+            files: ["my_cool_header.h", "main.cpp"]
+            Group {
+                name: "legacy"
+                files: "legacy/my_cool_header.h"
+                Qt.core.generatedHeadersDir: "qt.legacy.headers"
+            }
+        }
+    \endcode
+
+    \defaultvalue \c product.buildDirectory + "/qt.headers"
+*/
+
+/*!
     \qmlproperty bool Qt.core::metaTypesInstallDir
 
     The directory to install the metatypes file into. If this property is empty or undefined,
@@ -352,6 +378,14 @@
 */
 
 /*!
+    \qmlproperty string Qt.core::qdocOutputDir
+
+    The directory name where the \c qdoc tool writes its output.
+
+    \defaultvalue \c{product.buildDirectory + "/qdoc_html"}
+*/
+
+/*!
     \qmlproperty string Qt.core::qmBaseName
 
     The base name of the \c .qm file to be built from the \c .ts files in the
@@ -363,6 +397,14 @@
 */
 
 /*!
+    \qmlproperty string Qt.core::qmDir
+
+    The directory name where to put the \c .qm file to be built.
+
+    \defaultvalue \l{Product::destinationDirectory}{product.destinationDirectory}
+*/
+
+/*!
     \qmlproperty string Qt.core::qtBuildVariant
 
     Specifies the type of Qt libraries to build against: \c "debug" or