forked from qt-creator/qt-creator
Fix $$OUT_PWD not beeing set for finding the target/destdir
Qt Creator wouldn't find the correct target if shadow building a project that uses $$OUT_PWD, like for example itemviews-ng. We didn't set the necessary variable on the ProFileReader *, simplified the code to always use a ProFileReader created for the exact profilenode.
This commit is contained in:
@@ -48,6 +48,8 @@
|
||||
#include <cpptools/cppmodelmanagerinterface.h>
|
||||
#include <cplusplus/CppDocument.h>
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <projectexplorer/buildmanager.h>
|
||||
|
||||
#include <utils/qtcassert.h>
|
||||
|
||||
@@ -498,8 +500,16 @@ QStringList Qt4PriFileNode::varNames(FileType type)
|
||||
return vars;
|
||||
}
|
||||
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <projectexplorer/buildmanager.h>
|
||||
Qt4PriFileNode *Qt4PriFileNode::findProFileFor(const QString &fileName)
|
||||
{
|
||||
if (fileName == path())
|
||||
return this;
|
||||
foreach (ProjectNode *pn, subProjectNodes())
|
||||
if (Qt4PriFileNode *qt4PriFileNode = qobject_cast<Qt4PriFileNode *>(pn))
|
||||
if (Qt4PriFileNode *result = qt4PriFileNode->findProFileFor(fileName))
|
||||
return result;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*!
|
||||
\class Qt4ProFileNode
|
||||
|
||||
Reference in New Issue
Block a user