feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Debug/Run capabilities now react to toolchain changes.

Browse Source
This commit is contained in:
Christian Kandeler
2010-09-15 10:36:38 +02:00
parent 5e0e60a5ab
commit 1b0487d505
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
View File

@@ -286,6 +286,7 @@ void MaemoRunConfigurationWidget::handleToolchainChanged()
= m_runConfiguration->toolchain()->allowsRemoteMounts(); = m_runConfiguration->toolchain()->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable); m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable); m_mountDetailsContainer->setVisible(remoteMountsAvailable);
m_runConfiguration->updateFactoryState();
} }
void MaemoRunConfigurationWidget::showSettingsDialog(const QString &link) void MaemoRunConfigurationWidget::showSettingsDialog(const QString &link)

5
src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
View File

@@ -39,6 +39,7 @@
#include "maemoremotemountsmodel.h" #include "maemoremotemountsmodel.h"
#include "maemorunconfiguration.h" #include "maemorunconfiguration.h"
#include "maemoruncontrol.h" #include "maemoruncontrol.h"
#include "maemotoolchain.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
@@ -167,7 +168,9 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
if (freePortCount == 0) if (freePortCount == 0)
return false; return false;
const int mountDirCount const int mountDirCount
= maemoRunConfig->remoteMounts()->validMountSpecificationCount(); = maemoRunConfig->toolchain()->allowsRemoteMounts()
? maemoRunConfig->remoteMounts()->validMountSpecificationCount()
: 0;
if (mode == ProjectExplorer::Constants::DEBUGMODE) if (mode == ProjectExplorer::Constants::DEBUGMODE)
return freePortCount > mountDirCount + runConfiguration->useQmlDebugger(); return freePortCount > mountDirCount + runConfiguration->useQmlDebugger();
if (mode == ProjectExplorer::Constants::RUNMODE) if (mode == ProjectExplorer::Constants::RUNMODE)