aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2015-08-15 18:25:50 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-08-17 10:17:38 +0000
commit9de44d67891271d5b0f237fd83d726ee6f9819d1 (patch)
tree93b834b4af8864a847b76ef7bc056cc99d72856d
parent0abd1f7b723335df7a24da3e5194f8050dc635b8 (diff)
Replace left-over occurrences of "additionalProductFileTags".
These were apparently forgotten in f1db83fdfe. Change-Id: Ia4a82f49bdfadb879b8ebca7400c7be9774b5523 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--doc/reference/items/module.qdoc2
-rw-r--r--src/lib/corelib/language/builtindeclarations.cpp2
-rw-r--r--tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/reference/items/module.qdoc b/doc/reference/items/module.qdoc
index 343790f47..fb4c3180d 100644
--- a/doc/reference/items/module.qdoc
+++ b/doc/reference/items/module.qdoc
@@ -157,7 +157,7 @@
\li Default
\li Description
\row
- \li additionalProductFileTags
+ \li additionalProductTypes
\li string list
\li empty list
\li The elements of this list will be added to the \c type property of a product
diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index b7f7ff6be..c5949db77 100644
--- a/src/lib/corelib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
@@ -224,7 +224,7 @@ void BuiltinDeclarations::addModuleLikeItem(const QString &typeName)
item << PropertyDeclaration(QLatin1String("validate"),
PropertyDeclaration::Variant,
PropertyDeclaration::PropertyNotAvailableInConfig);
- item << PropertyDeclaration(QLatin1String("additionalProductFileTags"),
+ item << PropertyDeclaration(QLatin1String("additionalProductTypes"),
PropertyDeclaration::Variant);
PropertyDeclaration presentDecl(QLatin1String("present"), PropertyDeclaration::Boolean);
presentDecl.setInitialValueSource(QLatin1String("true"));
diff --git a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
index 54179fb0f..3f3e5805e 100644
--- a/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
+++ b/tests/auto/blackbox/testdata/groups-in-modules/modules/helper/helper.qbs
@@ -4,7 +4,7 @@ import qbs.FileInfo
Module {
Depends { name: "cpp" }
- additionalProductFileTags: ["diamond"]
+ additionalProductTypes: ["diamond"]
Group {
name: "Helper Sources"