Commit 7c1f9fba authored by Lasse Holmstedt's avatar Lasse Holmstedt

Debugger: Disable auto switching of debugger languages based on qmlfiles

parent c685c87f
......@@ -80,7 +80,6 @@ public:
QString qmlServerAddress;
quint16 qmlServerPort;
DebuggerEngineType cppEngineType; // for cpp+qml debugging
bool m_isQmlProject;
// for remote debugging
QString remoteChannel;
......
......@@ -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);
}
......
......@@ -118,8 +118,6 @@ public:
QString *settingsCategory = 0,
QString *settingsPage = 0);
static bool isQmlProject(RunConfiguration *config);
private slots:
void handleFinished();
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment