From fd81a276ca5b400d33f8f9749d9fca04a78debb3 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Wed, 17 Mar 2010 08:56:42 +0100
Subject: [PATCH] Only attempt to connect debugger if debug mode is activated
---
src/plugins/projectexplorer/projectexplorer.cpp | 2 +-
src/plugins/projectexplorer/projectexplorer.h | 2 +-
src/plugins/qmlinspector/qmlinspectorplugin.cpp | 16 ++++++++++------
src/plugins/qmlinspector/qmlinspectorplugin.h | 2 +-
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 2cf2eeec962..8ac706e4502 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1259,7 +1259,7 @@ void ProjectExplorerPlugin::buildStateChanged(Project * pro)
void ProjectExplorerPlugin::executeRunConfiguration(RunConfiguration *runConfiguration, const QString &runMode)
{
if (IRunControlFactory *runControlFactory = findRunControlFactory(runConfiguration, runMode)) {
- emit aboutToExecuteProject(runConfiguration->target()->project());
+ emit aboutToExecuteProject(runConfiguration->target()->project(), runMode);
RunControl *control = runControlFactory->create(runConfiguration, runMode);
startRunControl(control, runMode);
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 44031424741..bc4e7ff3512 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -146,7 +146,7 @@ signals:
void currentProjectChanged(ProjectExplorer::Project *project);
void currentNodeChanged(ProjectExplorer::Node *node, ProjectExplorer::Project *project);
- void aboutToExecuteProject(ProjectExplorer::Project *project);
+ void aboutToExecuteProject(ProjectExplorer::Project *project, const QString &runMode);
void settingsChanged();
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 3b25a5436c6..0a27b96d25d 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -65,6 +65,7 @@
using namespace Qml;
+
static QToolButton *createToolButton(QAction *action)
{
QToolButton *button = new QToolButton;
@@ -95,6 +96,7 @@ bool QmlInspectorPlugin::initialize(const QStringList &arguments, QString *error
Q_UNUSED(arguments);
Q_UNUSED(errorString);
+ Core::ICore *core = Core::ICore::instance();
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
SLOT(prepareDebugger(Core::IMode*)));
@@ -119,8 +121,8 @@ void QmlInspectorPlugin::extensionsInitialized()
ProjectExplorer::ProjectExplorerPlugin *pex = ProjectExplorer::ProjectExplorerPlugin::instance();
if (pex) {
- connect(pex, SIGNAL(aboutToExecuteProject(ProjectExplorer::Project*)),
- SLOT(activateDebuggerForProject(ProjectExplorer::Project*)));
+ connect(pex, SIGNAL(aboutToExecuteProject(ProjectExplorer::Project*, QString)),
+ SLOT(activateDebuggerForProject(ProjectExplorer::Project*, QString)));
}
QWidget *configBar = new QWidget;
@@ -147,11 +149,13 @@ void QmlInspectorPlugin::activateDebugger(const QString &langName)
}
}
-void QmlInspectorPlugin::activateDebuggerForProject(ProjectExplorer::Project *project)
+void QmlInspectorPlugin::activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode)
{
- QmlProjectManager::QmlProject *qmlproj = qobject_cast<QmlProjectManager::QmlProject*>(project);
- if (qmlproj)
- m_connectionTimer->start();
+ if (runMode == ProjectExplorer::Constants::DEBUGMODE) {
+ QmlProjectManager::QmlProject *qmlproj = qobject_cast<QmlProjectManager::QmlProject*>(project);
+ if (qmlproj)
+ m_connectionTimer->start();
+ }
}
void QmlInspectorPlugin::pollInspector()
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.h b/src/plugins/qmlinspector/qmlinspectorplugin.h
index 738df9a2174..9a592156f50 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.h
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.h
@@ -64,7 +64,7 @@ public:
public slots:
void activateDebugger(const QString &langName);
- void activateDebuggerForProject(ProjectExplorer::Project *project);
+ void activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode);
void setDockWidgetArrangement(const QString &activeLanguage);
private slots:
--
GitLab