Allow lists of patterns in the FileTagger item.

Rationale: It is not uncommon that the same tag is associated
with more than one file pattern; more common, in fact, than the
other way around. It therefore seems silly to force module authors
to create one FileTagger item per file extension.
For semantic consistency, the "pattern" property gets renamed to
"patterns". The old name is still supported in this minor version.

Change-Id: Ia7f744b0903462517582fcb549e2dab004c81dd5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index 91ff72578..d633434a9 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -417,7 +417,7 @@
         property path precompiledHeader
         // ...
         FileTagger {
-            pattern: "*.cpp"
+            patterns: "*.cpp"
             fileTags: ["cpp"]
         }
         Rule {...}  // compiler
@@ -603,7 +603,7 @@
     When you load the \a cpp module, you also load the following item:
     \code
         FileTagger {
-            pattern: "*.cpp"
+            patterns: "*.cpp"
             fileTags: ["cpp"]
         }
     \endcode
diff --git a/doc/reference/items/filetagger.qdoc b/doc/reference/items/filetagger.qdoc
index 4aa66603d..367612fef 100644
--- a/doc/reference/items/filetagger.qdoc
+++ b/doc/reference/items/filetagger.qdoc
@@ -42,7 +42,7 @@
     the following file tagger:
     \code
     FileTagger {
-        pattern: "*.cpp"
+        patterns: "*.cpp"
         fileTags: ["cpp"]
     }
     \endcode
@@ -73,10 +73,11 @@
         \li Default
         \li Description
     \row
-        \li pattern
-        \li string
+        \li patterns
+        \li stringList
         \li none
-        \li The pattern to match against. Supports the usual wildcards '*', '?' and '[]'.
+        \li The patterns to match against. Supports the usual wildcards '*', '?' and '[]'.
+            Neither the list itself nor any of its elements may be empty.
     \row
         \li fileTags
         \li list