OSDN Git Service

Qt4ProjectManager: Fix subnode build
authordt <qtc-committer@nokia.com>
Tue, 5 Oct 2010 15:34:28 +0000 (17:34 +0200)
committerdt <qtc-committer@nokia.com>
Tue, 5 Oct 2010 15:42:57 +0000 (17:42 +0200)
Reviewed-By: hunger
src/plugins/qt4projectmanager/qmakestep.cpp

index ec925b2..6e7003c 100644 (file)
@@ -194,10 +194,13 @@ bool QMakeStep::init()
 
     setOutputParser(new QMakeParser);
 
-    Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
-    QString proFile = pro->file()->fileName();
+    Qt4ProFileNode *node = qt4bc->qt4Target()->qt4Project()->rootProjectNode();
+    if (qt4bc->subNodeBuild())
+        node = qt4bc->subNodeBuild();
+    QString proFile = node->path();
+
     m_tasks = qt4BuildConfiguration()->qtVersion()->reportIssues(proFile, workingDirectory);
-    m_scriptTemplate = pro->rootProjectNode()->projectType() == ScriptTemplate;
+    m_scriptTemplate = node->projectType() == ScriptTemplate;
 
     return AbstractProcessStep::init();
 }