diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-30 11:07:10 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-01 08:33:23 +0000 |
| commit | a98ce82c53d610cee1110ac54a3e0ef430cb2809 (patch) | |
| tree | 4bb9e9331f2d4127cf4d7c6a5876859350d40180 | |
| parent | 9d28325c404a87757c61b7dba10f54b43c28cd11 (diff) | |
Version validator: Nicer error message for fixed component number.
Change-Id: I7172c5afb0fb831b733d352c328fe57fdd75c179
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | share/qbs/imports/qbs/ModUtils/utils.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js index 1983d30dd..43190d532 100644 --- a/share/qbs/imports/qbs/ModUtils/utils.js +++ b/share/qbs/imports/qbs/ModUtils/utils.js @@ -323,7 +323,10 @@ var PropertyValidator = (function () { if (typeof value !== "string") return false; return value && value.match("^[0-9]+(\\.[0-9]+){" + ((minComponents - 1) || 0) + "," + ((maxComponents - 1) || "") + "}" + (!allowSuffixes ? "$" : "")) !== null; - }, "must be a version number with " + minComponents + " to " + maxComponents + " components"); + }, "must be a version number with " + (minComponents === maxComponents + ? minComponents : (minComponents + " to " + maxComponents)) + + (minComponents === maxComponents && minComponents === 1 + ? " component" : " components")); }; PropertyValidator.prototype.addCustomValidator = function (propertyName, propertyValue, validator, message) { |