diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index a609d936249cecf3d033021a4988cde271a46552..04194e405f8c4870f31ca0aeffa56330c5e67d01 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -80,7 +80,6 @@ public: QString qmlServerAddress; quint16 qmlServerPort; DebuggerEngineType cppEngineType; // for cpp+qml debugging - bool m_isQmlProject; // for remote debugging QString remoteChannel; diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 282b531097e2cbb2e6f95bf927d9a2d1dd3e3c44..1d7db335ca1d44a4501b123f2f4eff6cf2bca063 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -232,7 +232,6 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration, { connect(this, SIGNAL(finished()), this, SLOT(handleFinished())); DebuggerStartParameters startParams = sp; - startParams.m_isQmlProject = isQmlProject(runConfiguration); createEngine(startParams); } diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index 724ba495c0c749384ef759a2f13977c3b86d61c3..2fbe020165ece04ce7e894cd13eb5226e6b7d435 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -118,8 +118,6 @@ public: QString *settingsCategory = 0, QString *settingsPage = 0); - static bool isQmlProject(RunConfiguration *config); - private slots: void handleFinished(); diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp index b10ece7bc744843d9c8676910c52a967ac5bba1c..a946c948f4e57c8ba8d7c6fbde080283ad4245fc 100644 --- a/src/plugins/debugger/debuggeruiswitcher.cpp +++ b/src/plugins/debugger/debuggeruiswitcher.cpp @@ -244,13 +244,12 @@ void DebuggerUISwitcher::updateUiForRunConfiguration(ProjectExplorer::RunConfigu bool isDotQmlProjectType = isQmlProjectType(rc); if (rc) { d->m_languageActionGroup->setDisabled(false); - if (DebuggerRunControl::isQmlProject(rc) && d->m_qmlEnabled) { + if (d->m_qmlEnabled) { d->m_activateCppAction->setChecked(!isDotQmlProjectType); - d->m_activateQmlAction->setChecked(true); + d->m_activateQmlAction->setChecked(isDotQmlProjectType); } else { - if (d->m_activateQmlAction) { + if (d->m_activateQmlAction) d->m_activateQmlAction->setChecked(false); - } } } else { if (d->m_activateCppAction)