summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-06-17 10:47:12 +0200
committerNiels Weber <niels.weber@digia.com>2013-06-17 11:12:12 +0200
commit06d10d2f65d11fec14eba230257b3c52e0be97bc (patch)
tree23f9b821eb3c9435a8fe3239c0310054fd077432
parentb322aa4076653ea4dbe7429367483736c35e267d (diff)
Fixed argument check of EnvironmentVariableOperation.
Task-number: QTIFW-286 Change-Id: I4c8cb25f70a05c7a5a3754e46680767d4b345523 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r--src/libs/installer/environmentvariablesoperation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/environmentvariablesoperation.cpp b/src/libs/installer/environmentvariablesoperation.cpp
index de2eae899..192272a8d 100644
--- a/src/libs/installer/environmentvariablesoperation.cpp
+++ b/src/libs/installer/environmentvariablesoperation.cpp
@@ -137,10 +137,10 @@ UpdateOperation::Error undoSetting(const QString &regPath,
bool EnvironmentVariableOperation::performOperation()
{
QStringList args = arguments();
- if (args.count() != 2 && args.count() != 3) {
+ if (args.count() < 2 || args.count() > 4) {
setError(InvalidArguments);
setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.")
- .arg(name()).arg(arguments().count()).arg(tr("2 or 3"), QLatin1String("")));
+ .arg(name()).arg(arguments().count()).arg(tr("2 to 4"), QLatin1String("")));
return false;
}