OSDN Git Service

QMakeStep: Honor declarative_debug configuration for imported builds
authorKai Koehne <kai.koehne@nokia.com>
Thu, 1 Sep 2011 14:16:59 +0000 (16:16 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Wed, 14 Sep 2011 09:25:00 +0000 (11:25 +0200)
commita4a05aef2b55014dcbf0f55755d4cdfee4ac7b12
treead4facb395d2bce2b04213635a2e6310f4d5ccaf
parent2d8acad3fc3a9509a405451b91dda59f1ea16637
QMakeStep: Honor declarative_debug configuration for imported builds

Honor the qmake line that is imported: If it contains declarative_debug
or QMLJSDEBUGGER_PATH, also set the option in the qmake step, if not
not.

Change-Id: Ibc524ff8d39b66f76cc79807264db0dd3534e2d7
Reviewed-on: http://codereview.qt-project.org/4090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.h
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/remotelinux/qt4maemotargetfactory.cpp