From 9a7ba8fd3f5084463d5d3c11c6693c96e34a256a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 7 Sep 2011 15:48:10 +0200 Subject: RemoteLinux: Respect qmake scopes for subdirs deployment. Task-number: QTCREATORBUG-6017 Change-Id: Ib7e3814c88ad4598e897a0c99103eafb61846eeb Reviewed-on: http://codereview.qt.nokia.com/4365 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/deploymentinfo.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/remotelinux') diff --git a/src/plugins/remotelinux/deploymentinfo.cpp b/src/plugins/remotelinux/deploymentinfo.cpp index d95b02e991..e6c0bbf85f 100644 --- a/src/plugins/remotelinux/deploymentinfo.cpp +++ b/src/plugins/remotelinux/deploymentinfo.cpp @@ -122,13 +122,11 @@ void DeploymentInfo::createModels(const Qt4ProFileNode *proFileNode) m_d->listModels << new DeployableFilesPerProFile(proFileNode, this); break; case SubDirsTemplate: { - const QList &subProjects - = proFileNode->subProjectNodes(); + const QList &subProjects = proFileNode->subProjectNodesExact(); foreach (const ProjectExplorer::ProjectNode * const subProject, subProjects) { const Qt4ProFileNode * const qt4SubProject = qobject_cast(subProject); - if (qt4SubProject && !qt4SubProject->path() - .endsWith(QLatin1String(".pri"))) + if (qt4SubProject && !qt4SubProject->path().endsWith(QLatin1String(".pri"))) createModels(qt4SubProject); } } -- cgit v1.2.1