diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-25 16:17:12 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-06-25 16:20:38 +0200 |
| commit | d0aee24ef00e16d4ad6308f314c1bed56800aa9c (patch) | |
| tree | fad50ba329551dcfc2d3cec0f2103974294cfa30 /src/libs/installer/qtpatchoperation.cpp | |
| parent | bfcbb9cc8ba292523d7bceef311ad23ec43527e7 (diff) | |
fix argument check in QtPatchOperation
Change-Id: I9220fec90df5b7dad2e49db90209e64bbc4fd8b2
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/qtpatchoperation.cpp')
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 25924811a..822d5e3a4 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -167,12 +167,13 @@ bool QtPatchOperation::performOperation() // 1. type // 2. new/target qtpath // 3. version if greather Qt4 + // optional QmakeOutputInstallerKey=<used_installer_value> // the possible 2 argument case is here to support old syntax - if (arguments().count() < 2 || arguments().count() > 3) { + if (arguments().count() < 2 && arguments().count() > 4) { setError(InvalidArguments); setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.") - .arg(name()).arg(arguments().count()).arg(tr("exactly 3"), QLatin1String(""))); + .arg(name()).arg(arguments().count()).arg(tr("3 or 4"), QLatin1String(""))); return false; } |