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

RemoteLinux: Respect qmake scopes for subdirs deployment.

Browse Source 
Task-number: QTCREATORBUG-6017

Change-Id: Ib7e3814c88ad4598e897a0c99103eafb61846eeb
Reviewed-on: http://codereview.qt.nokia.com/4365
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-09-07 15:48:10 +02:00
parent 5288267be0
commit 9a7ba8fd3f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,13 +122,11 @@ void DeploymentInfo::createModels(const Qt4ProFileNode *proFileNode)
m_d->listModels << new DeployableFilesPerProFile(proFileNode, this); m_d->listModels << new DeployableFilesPerProFile(proFileNode, this);
break; break;
case SubDirsTemplate: { case SubDirsTemplate: {
const QList<ProjectExplorer::ProjectNode *> &subProjects const QList<Qt4PriFileNode *> &subProjects = proFileNode->subProjectNodesExact();
= proFileNode->subProjectNodes();
foreach (const ProjectExplorer::ProjectNode * const subProject, subProjects) { foreach (const ProjectExplorer::ProjectNode * const subProject, subProjects) {
const Qt4ProFileNode * const qt4SubProject const Qt4ProFileNode * const qt4SubProject
= qobject_cast<const Qt4ProFileNode *>(subProject); = qobject_cast<const Qt4ProFileNode *>(subProject);
if (qt4SubProject && !qt4SubProject->path() if (qt4SubProject && !qt4SubProject->path().endsWith(QLatin1String(".pri")))
.endsWith(QLatin1String(".pri")))
createModels(qt4SubProject); createModels(qt4SubProject);
} }
} }