diff options
| author | Darryl L. Miles <darryl.miles@darrylmiles.org> | 2011-04-08 10:10:42 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-08 10:14:10 (GMT) |
| commit | 0dc9c8eb8535b1a678360e4d3183f0b1b5e79db3 (patch) | |
| tree | c749783132beb283f27ec2211a912d8c9c5b67de /qmake/main.cpp | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| download | Qt-0dc9c8eb8535b1a678360e4d3183f0b1b5e79db3.zip Qt-0dc9c8eb8535b1a678360e4d3183f0b1b5e79db3.tar.gz Qt-0dc9c8eb8535b1a678360e4d3183f0b1b5e79db3.tar.bz2 | |
Add support for -unset <prop> option to qmake.
Merge-request: 1175
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 7dab23d..7d4d458 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -126,7 +126,9 @@ int runQMake(int argc, char **argv) } QMakeProperty prop; - if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || Option::qmake_mode == Option::QMAKE_SET_PROPERTY) + if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || + Option::qmake_mode == Option::QMAKE_SET_PROPERTY || + Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY) return prop.exec() ? 0 : 101; QMakeProject project(&prop); |