diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-10-13 14:01:28 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-10-13 15:28:54 +0200 |
| commit | b8ed8f493f705f6a91b275f061fa0ee26ce75126 (patch) | |
| tree | d9f867308362b6d1656044ee1575071e00626882 /src/plugins/qt4projectmanager | |
| parent | 584a8f016ebc61b584b3ca696328b03586cb231e (diff) | |
| download | qt-creator-b8ed8f493f705f6a91b275f061fa0ee26ce75126.tar.gz | |
Actually delete CONFIG+=declarative from list of user arguments
Fix incorrect merge in b0efd44d20e9129c40b47ad3715c248962a947b9 .
Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 9c8136f522..9d172accd9 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -551,6 +551,7 @@ bool Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args) const QString arg = ait.value(); if (arg.contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH)) || arg.contains(Constants::QMAKEVAR_DECLARATIVE_DEBUG)) { + ait.deleteArg(); removedArgument = true; } } |