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

Header cleanup in Qt4ProjectManager.

Browse Source 
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-08-18 16:46:44 +02:00
parent 4c116bbda6
commit d4e1d7c6ad
45 changed files with 231 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/remotelinux/deploymentinfo.cpp
View File

@@ -87,8 +87,8 @@ void DeploymentInfo::createModels()
{
if (m_d->target->project()->activeTarget() != m_d->target)
return;
if (!m_d->target->activeBuildConfiguration() || !m_d->target->activeBuildConfiguration()->qtVersion()
|| !m_d->target->activeBuildConfiguration()->qtVersion()->isValid()) {
const Qt4BuildConfiguration *bc = m_d->target->activeQt4BuildConfiguration();
if (!bc || !bc->qtVersion() || !bc->qtVersion()->isValid()) {
beginResetModel();
qDeleteAll(m_d->listModels);
m_d->listModels.clear();
@@ -96,7 +96,7 @@ void DeploymentInfo::createModels()
return;
}
const Qt4ProFileNode *const rootNode
= m_d->target->qt4Project()->rootProjectNode();
= m_d->target->qt4Project()->rootQt4ProjectNode();
if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return;
m_d->updateTimer.stop();