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

Maemo: Toolchain for remote mounter needs to be dynamic.

Browse Source
This commit is contained in:
Christian Kandeler
2010-08-23 15:54:35 +02:00
parent c0a922f742
commit 14d7f6b661
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -104,11 +104,7 @@ void MaemoDeployStep::ctor()
m_cleanupTimer->setSingleShot(true);
connect(m_cleanupTimer, SIGNAL(timeout()), this,
SLOT(handleCleanupTimeout()));
const Qt4BuildConfiguration * const buildConfig
= qobject_cast<Qt4BuildConfiguration *>(buildConfiguration());
const MaemoToolChain * const toolchain
= dynamic_cast<MaemoToolChain *>(buildConfig->toolChain());
m_mounter = new MaemoRemoteMounter(this, toolchain);
m_mounter = new MaemoRemoteMounter(this);
connect(m_mounter, SIGNAL(mounted()), this, SLOT(handleMounted()));
connect(m_mounter, SIGNAL(unmounted()), this, SLOT(handleUnmounted()));
connect(m_mounter, SIGNAL(error(QString)), this,
@@ -585,6 +581,7 @@ void MaemoDeployStep::handleUnmounted()
Q_ASSERT(m_needsInstall || !m_filesToCopy.isEmpty());
m_mounter->resetMountSpecifications();
m_mounter->setToolchain(toolChain());
m_mounter->setPortList(deviceConfig().freePorts());
if (m_needsInstall) {
const QString localDir