diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp index 852f24ab4360f1e4be49ac84617f90e18fa7c3fc..d7a3f11949e6420f05bf758a960cf7ceb69b68eb 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp @@ -164,6 +164,8 @@ void MaemoPackageCreationWidget::setPackageManagerIcon() void MaemoPackageCreationWidget::handleToolchainChanged() { + if (!m_step->maemoToolChain()) + return; m_ui->skipCheckBox ->setVisible(m_step->maemoToolChain()->allowsPackagingDisabling()); m_ui->skipCheckBox->setChecked(!m_step->isPackagingEnabled()); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp index c9d40fea523b4817304d3520d42b6ccc6a5c04ce..d732991918fcae8965a44a3f53d1930233027b21 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp @@ -298,10 +298,12 @@ void MaemoRunConfigurationWidget::handleBuildConfigChanged() void MaemoRunConfigurationWidget::handleToolchainChanged() { - const bool remoteMountsAvailable - = m_runConfiguration->toolchain()->allowsRemoteMounts(); - m_debugDetailsContainer->setVisible(remoteMountsAvailable); - m_mountDetailsContainer->setVisible(remoteMountsAvailable); + const MaemoToolChain * const toolChain = m_runConfiguration->toolchain(); + if (toolChain) { + const bool remoteMountsAvailable = toolChain->allowsRemoteMounts(); + m_debugDetailsContainer->setVisible(remoteMountsAvailable); + m_mountDetailsContainer->setVisible(remoteMountsAvailable); + } m_runConfiguration->updateFactoryState(); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp index 72d8309b9780b9fcf0257f3f574892ab4e9155c5..0ee8512d1d34b457c81add6391af01f40ef2f20e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp @@ -162,7 +162,8 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration, { const MaemoRunConfiguration * const maemoRunConfig = qobject_cast<MaemoRunConfiguration *>(runConfiguration); - if (!maemoRunConfig || !maemoRunConfig->deviceConfig().isValid()) + if (!maemoRunConfig || !maemoRunConfig->deviceConfig().isValid() + || !maemoRunConfig->toolchain()) return false; const int freePortCount = maemoRunConfig->freePorts().count(); if (freePortCount == 0)