diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-31 14:56:03 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-02 08:28:22 +0000 |
| commit | 3a51a17d72f49647449eab949ae30d7c09ced3ef (patch) | |
| tree | 3f1a5ed8f9de12a633351b2b785049c0c824cf0a | |
| parent | 38d8f7144783f4226cc502a5cddf6e38556fedff (diff) | |
Remove assertions from command line parser
They serve no useful purpose.
Task-number: QBS-1015
Change-Id: I6e333250486e76033fe630d1d8cd0aad0aac74a0
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | src/app/qbs/parser/commandlineoption.cpp | 3 | ||||
| -rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp index 895eb42b8..3ad60e292 100644 --- a/src/app/qbs/parser/commandlineoption.cpp +++ b/src/app/qbs/parser/commandlineoption.cpp @@ -455,7 +455,6 @@ QString ForceOutputCheckOption::longRepresentation() const QString BuildNonDefaultOption::description(CommandType command) const { - Q_ASSERT(command == BuildCommandType || command == InstallCommandType); Q_UNUSED(command); return Tr::tr("%1\n\tBuild all products, even if their builtByDefault property is false.\n") .arg(longRepresentation()); @@ -492,7 +491,6 @@ static QString magicSysrootString() { return QLatin1String("@sysroot"); } QString InstallRootOption::description(CommandType command) const { - Q_ASSERT(command == InstallCommandType || command == RunCommandType); Q_UNUSED(command); return Tr::tr("%1 <directory>\n" "\tInstall into the given directory.\n" @@ -536,7 +534,6 @@ QString RemoveFirstOption::longRepresentation() const QString NoBuildOption::description(CommandType command) const { - Q_ASSERT(command == InstallCommandType || command == RunCommandType); Q_UNUSED(command); return Tr::tr("%1\n\tDo not build before installing.\n") .arg(longRepresentation()); diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 6abc9a83b..d1ab5d176 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -161,7 +161,6 @@ BuildOptions CommandLineParser::buildOptions(const QString &profile) const CleanOptions CommandLineParser::cleanOptions(const QString &profile) const { - Q_ASSERT(command() == CleanCommandType); CleanOptions options; options.setDryRun(buildOptions(profile).dryRun()); options.setKeepGoing(buildOptions(profile).keepGoing()); @@ -171,7 +170,6 @@ CleanOptions CommandLineParser::cleanOptions(const QString &profile) const GenerateOptions CommandLineParser::generateOptions() const { - Q_ASSERT(command() == GenerateCommandType); GenerateOptions options; options.setGeneratorName(d->optionPool.generatorOption()->generatorName()); return options; @@ -179,8 +177,6 @@ GenerateOptions CommandLineParser::generateOptions() const InstallOptions CommandLineParser::installOptions(const QString &profile) const { - Q_ASSERT(command() == InstallCommandType || command() == RunCommandType - || command() == GenerateCommandType); InstallOptions options; options.setRemoveExistingInstallation(d->optionPool.removeFirstoption()->enabled()); options.setInstallRoot(d->optionPool.installRootOption()->installRoot()); |