diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-15 11:50:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-15 11:50:29 +0200 |
| commit | b0efd44d20e9129c40b47ad3715c248962a947b9 (patch) | |
| tree | 4415eccb62e5fca5bf1f83d19f1cdaad6ca339e7 /src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | |
| parent | 8801c76a8e223b6f41a8369e75c71b67237d8d25 (diff) | |
| parent | 33cd873d56f948b4805da31adaf436618ac7edac (diff) | |
| download | qt-creator-b0efd44d20e9129c40b47ad3715c248962a947b9.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
qtcreator.pro
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/remotelinux/remotelinuxruncontrol.cpp
Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4buildconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 39833e6ee4..96dc194795 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -535,8 +535,9 @@ bool Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args) { bool removedArgument = false; for (Utils::QtcProcess::ArgIterator ait(args); ait.next(); ) { - if (ait.value().contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH))) { - ait.deleteArg(); + const QString arg = ait.value(); + if (arg.contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH)) + || arg.contains(Constants::QMAKEVAR_DECLARATIVE_DEBUG)) { removedArgument = true; } } |