diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
| commit | 4bc574125b76f480c8eb5719459baa9bd0b8e1c3 (patch) | |
| tree | 5248d80420cbea7aa39f5355cf5b320486b99a1c /src/app/qbs/parser/commandlineoption.cpp | |
| parent | 9362b2a4be9f3a92020a169f1bb2896667974dda (diff) | |
| parent | 3a51a17d72f49647449eab949ae30d7c09ced3ef (diff) | |
Merge 1.6 into master
Change-Id: Ica9e01e8dc03fe0d36568a270bbad9b85919c952
Diffstat (limited to 'src/app/qbs/parser/commandlineoption.cpp')
| -rw-r--r-- | src/app/qbs/parser/commandlineoption.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp index ec7cb401e..748457b52 100644 --- a/src/app/qbs/parser/commandlineoption.cpp +++ b/src/app/qbs/parser/commandlineoption.cpp @@ -464,7 +464,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()); @@ -501,8 +500,6 @@ static QString magicSysrootString() { return QLatin1String("@sysroot"); } QString InstallRootOption::description(CommandType command) const { - Q_ASSERT(command == InstallCommandType || command == RunCommandType - || command == GenerateCommandType); Q_UNUSED(command); return Tr::tr("%1 <directory>\n" "\tInstall into the given directory.\n" @@ -546,7 +543,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()); |