diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index 2bd45a1f335..92572390102 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -34,6 +34,7 @@ #include "s60devicerunconfigurationwidget.h" #include "s60devicerunconfiguration.h" +#include #include #include @@ -69,12 +70,26 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget( detailsBoxLayout->addLayout(formLayout); formLayout->addRow(tr("Arguments:"), m_argumentsLineEdit); + m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); + formLayout->addRow(tr("Debugger:"), m_debuggerLanguageChooser); + + m_debuggerLanguageChooser->setCppChecked(m_runConfiguration->useCppDebugger()); + m_debuggerLanguageChooser->setQmlChecked(m_runConfiguration->useQmlDebugger()); + m_debuggerLanguageChooser->setQmlDebugServerPort(m_runConfiguration->qmlDebugServerPort()); + connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)), this, SLOT(argumentsEdited(QString))); connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)), this, SLOT(runConfigurationEnabledChange(bool))); + connect(m_debuggerLanguageChooser, SIGNAL(cppLanguageToggled(bool)), + this, SLOT(useCppDebuggerToggled(bool))); + connect(m_debuggerLanguageChooser, SIGNAL(qmlLanguageToggled(bool)), + this, SLOT(useQmlDebuggerToggled(bool))); + connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)), + this, SLOT(qmlDebugServerPortChanged(uint))); + setEnabled(m_runConfiguration->isEnabled()); } @@ -88,5 +103,20 @@ void S60DeviceRunConfigurationWidget::runConfigurationEnabledChange(bool enabled setEnabled(enabled); } +void S60DeviceRunConfigurationWidget::useCppDebuggerToggled(bool enabled) +{ + m_runConfiguration->setUseCppDebugger(enabled); +} + +void S60DeviceRunConfigurationWidget::useQmlDebuggerToggled(bool enabled) +{ + m_runConfiguration->setUseQmlDebugger(enabled); +} + +void S60DeviceRunConfigurationWidget::qmlDebugServerPortChanged(uint port) +{ + m_runConfiguration->setQmlDebugServerPort(port); +} + } // namespace Internal } // namespace Qt4ProjectManager diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h index f150ecf3d7e..afafcdab3ba 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h @@ -42,6 +42,7 @@ QT_END_NAMESPACE namespace Utils { class DetailsWidget; + class DebuggerLanguageChooser; } namespace Qt4ProjectManager { @@ -58,10 +59,14 @@ public: private slots: void argumentsEdited(const QString &text); void runConfigurationEnabledChange(bool enabled); + void useCppDebuggerToggled(bool); + void useQmlDebuggerToggled(bool); + void qmlDebugServerPortChanged(uint); private: S60DeviceRunConfiguration *m_runConfiguration; Utils::DetailsWidget *m_detailsWidget; + Utils::DebuggerLanguageChooser *m_debuggerLanguageChooser; QLineEdit *m_argumentsLineEdit; };