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/property.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/property.cpp')
-rw-r--r-- | qmake/property.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index d84f8e1..0c36c1c 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -160,6 +160,13 @@ QMakeProperty::setValue(QString var, const QString &val) settings->setValue(keyBase() + var, val); } +void +QMakeProperty::remove(const QString &var) +{ + initSettings(); + settings->remove(keyBase() + var); +} + bool QMakeProperty::exec() { @@ -230,6 +237,13 @@ QMakeProperty::exec() if(!var.startsWith(".")) setValue(var, (*it)); } + } else if(Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY) { + for(QStringList::ConstIterator it = Option::prop::properties.begin(); + it != Option::prop::properties.end(); it++) { + QString var = (*it); + if(!var.startsWith(".")) + remove(var); + } } return ret; } |