OSDN Git Service

RemoteLinux: Respect qmake scopes for subdirs deployment.
authorChristian Kandeler <christian.kandeler@nokia.com>
Wed, 7 Sep 2011 13:48:10 +0000 (15:48 +0200)
committerChristian Kandeler <christian.kandeler@nokia.com>
Wed, 7 Sep 2011 13:50:56 +0000 (15:50 +0200)
Task-number: QTCREATORBUG-6017

Change-Id: Ib7e3814c88ad4598e897a0c99103eafb61846eeb
Reviewed-on: http://codereview.qt.nokia.com/4365
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
src/plugins/remotelinux/deploymentinfo.cpp

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