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

Maemo: Fix deployables update after toolchain switch.

Browse Source
This commit is contained in:
Christian Kandeler
2010-08-26 11:15:58 +02:00
parent d3c496f86d
commit 4387b47f92
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
View File

@@ -55,7 +55,7 @@ namespace Qt4ProjectManager {
namespace Internal {
MaemoDeployables::MaemoDeployables(const ProjectExplorer::BuildStep *buildStep)
: m_proFileOption(new ProFileOption), m_buildStep(buildStep)
: m_buildStep(buildStep)
{
QTimer::singleShot(0, this, SLOT(init()));
}
@@ -64,8 +64,6 @@ MaemoDeployables::~MaemoDeployables() {}
void MaemoDeployables::init()
{
m_proFileOption->properties
= qt4BuildConfiguration()->qtVersion()->versionInfo();
createModels();
connect(qt4BuildConfiguration()->qt4Target()->qt4Project(),
SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
@@ -74,7 +72,11 @@ void MaemoDeployables::init()
void MaemoDeployables::createModels()
{
qDeleteAll(m_listModels);
m_listModels.clear();
m_proFileOption = QSharedPointer<ProFileOption>(new ProFileOption);
m_proFileOption->properties
= qt4BuildConfiguration()->qtVersion()->versionInfo();
createModels(qt4BuildConfiguration()->qt4Target()->qt4Project()
->rootProjectNode());
emit modelsCreated();
@@ -155,7 +157,7 @@ QString MaemoDeployables::remoteExecutableFilePath(const QString &localExecutabl
const Qt4BuildConfiguration *MaemoDeployables::qt4BuildConfiguration() const
{
const Qt4BuildConfiguration * const bc
= qobject_cast<Qt4BuildConfiguration *>(m_buildStep->buildConfiguration());
= qobject_cast<Qt4BuildConfiguration *>(m_buildStep->target()->activeBuildConfiguration());
Q_ASSERT(bc);
return bc;
}