From 1b0487d50550b472f30d0e79b98c574214a3af09 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 15 Sep 2010 10:36:38 +0200
Subject: [PATCH] Maemo: Debug/Run capabilities now react to toolchain changes.
---
.../qt-maemo/maemorunconfigurationwidget.cpp | 1 +
src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index d6bcd2d5f05..b0ce36d55d3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -286,6 +286,7 @@ void MaemoRunConfigurationWidget::handleToolchainChanged()
= m_runConfiguration->toolchain()->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable);
+ m_runConfiguration->updateFactoryState();
}
void MaemoRunConfigurationWidget::showSettingsDialog(const QString &link)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
index dad1736d5a9..f531d609c7e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
@@ -39,6 +39,7 @@
#include "maemoremotemountsmodel.h"
#include "maemorunconfiguration.h"
#include "maemoruncontrol.h"
+#include "maemotoolchain.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <qt4projectmanager/qt4project.h>
@@ -167,7 +168,9 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
if (freePortCount == 0)
return false;
const int mountDirCount
- = maemoRunConfig->remoteMounts()->validMountSpecificationCount();
+ = maemoRunConfig->toolchain()->allowsRemoteMounts()
+ ? maemoRunConfig->remoteMounts()->validMountSpecificationCount()
+ : 0;
if (mode == ProjectExplorer::Constants::DEBUGMODE)
return freePortCount > mountDirCount + runConfiguration->useQmlDebugger();
if (mode == ProjectExplorer::Constants::RUNMODE)
--
GitLab