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>

6 files changed, 14 insertions, 59 deletions

diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs
index 64742406e..c940a1bfe 100644
--- a/share/qbs/modules/Qt/core/core.qbs
+++ b/share/qbs/modules/Qt/core/core.qbs
@@ -178,27 +178,27 @@ Module {
     }
 
     FileTagger {
-        pattern: "*.qrc"
+        patterns: ["*.qrc"]
         fileTags: ["qrc"]
     }
 
     FileTagger {
-        pattern: "*.ts"
+        patterns: ["*.ts"]
         fileTags: ["ts"]
     }
 
     FileTagger {
-        pattern: "*.qdoc"
+        patterns: ["*.qdoc"]
         fileTags: ["qdoc"]
     }
 
     FileTagger {
-        pattern: "*.qdocconf"
+        patterns: ["*.qdocconf"]
         fileTags: ["qdocconf"]
     }
 
     FileTagger {
-        pattern: "*.qhp"
+        patterns: ["*.qhp"]
         fileTags: ["qhp"]
     }
 
diff --git a/share/qbs/modules/Qt/gui/gui.qbs b/share/qbs/modules/Qt/gui/gui.qbs
index 319f07008..a87d59cdc 100644
--- a/share/qbs/modules/Qt/gui/gui.qbs
+++ b/share/qbs/modules/Qt/gui/gui.qbs
@@ -9,7 +9,7 @@ QtModule {
     property string uicName: "uic"
 
     FileTagger {
-        pattern: "*.ui"
+        patterns: ["*.ui"]
         fileTags: ["ui"]
     }
 
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index e6841e499..f6c339d14 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -179,67 +179,27 @@ Module {
     property string provisionFile
 
     FileTagger {
-        pattern: "*.c"
+        patterns: ["*.c"]
         fileTags: ["c"]
     }
 
     FileTagger {
-        pattern: "*.C"
+        patterns: ["*.C", "*.cpp", "*.cxx", "*.c++", "*.cc"]
         fileTags: ["cpp"]
     }
 
     FileTagger {
-        pattern: "*.cpp"
-        fileTags: ["cpp"]
-    }
-
-    FileTagger {
-        pattern: "*.cxx"
-        fileTags: ["cpp"]
-    }
-
-    FileTagger {
-        pattern: "*.c++"
-        fileTags: ["cpp"]
-    }
-
-    FileTagger {
-        pattern: "*.cc"
-        fileTags: ["cpp"]
-    }
-
-    FileTagger {
-        pattern: "*.m"
+        patterns: ["*.m"]
         fileTags: ["objc"]
     }
 
     FileTagger {
-        pattern: "*.mm"
+        patterns: ["*.mm"]
         fileTags: ["objcpp"]
     }
 
     FileTagger {
-        pattern: "*.h"
-        fileTags: ["hpp"]
-    }
-
-    FileTagger {
-        pattern: "*.H"
-        fileTags: ["hpp"]
-    }
-
-    FileTagger {
-        pattern: "*.hpp"
-        fileTags: ["hpp"]
-    }
-
-    FileTagger {
-        pattern: "*.hxx"
-        fileTags: ["hpp"]
-    }
-
-    FileTagger {
-        pattern: "*.h++"
+        patterns: ["*.h", "*.H", "*.hpp", "*.hxx", "*.h++"]
         fileTags: ["hpp"]
     }
 }
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index 2cb80ca6b..c46a7432c 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -32,7 +32,7 @@ GenericGCC {
     }
 
     FileTagger {
-        pattern: "*.rc"
+        patterns: ["*.rc"]
         fileTags: ["rc"]
     }
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index d3fd7c2a5..944a9e1fc 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -232,7 +232,7 @@ CppModule {
     }
 
     FileTagger {
-        pattern: "*.rc"
+        patterns: ["*.rc"]
         fileTags: ["rc"]
     }
 
diff --git a/share/qbs/modules/ib/IBModule.qbs b/share/qbs/modules/ib/IBModule.qbs
index 3e470e4ff..32f212c02 100644
--- a/share/qbs/modules/ib/IBModule.qbs
+++ b/share/qbs/modules/ib/IBModule.qbs
@@ -18,12 +18,7 @@ Module {
     property stringList flags
 
     FileTagger {
-        pattern: "*.nib"
-        fileTags: ["nib"]
-    }
-
-    FileTagger {
-        pattern: "*.xib"
+        patterns: ["*.nib", "*.xib"]
         fileTags: ["nib"]
     }