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

ProjectExplorer: Resolve any CurrentProject:<foo> in default build path

Browse Source 
If ProjectMacroExpander doesn't resolve it we fall back to the generic
ProjectExplorer resolution, which is likely to pick the wrong project.

Task-number: QTCREATORBUG-16724
Change-Id: I201b722c5fe184905f744a1f344ec46941f92ae3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-08 18:35:32 +02:00
parent 9142934d8e
commit bac2d18405
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -193,7 +193,7 @@ FileName CMakeBuildConfiguration::shadowBuildDirectory(const FileName &projectFi
return FileName(); return FileName();
const QString projectName = projectFilePath.parentDir().fileName(); const QString projectName = projectFilePath.parentDir().fileName();
ProjectMacroExpander expander(projectName, k, bcName, buildType); ProjectMacroExpander expander(projectFilePath.toString(), projectName, k, bcName, buildType);
QDir projectDir = QDir(Project::projectDirectory(projectFilePath).toString()); QDir projectDir = QDir(Project::projectDirectory(projectFilePath).toString());
QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory());
return FileName::fromUserInput(projectDir.absoluteFilePath(buildPath)); return FileName::fromUserInput(projectDir.absoluteFilePath(buildPath));

2
src/plugins/nim/project/nimbuildconfigurationfactory.cpp
View File

@@ -180,7 +180,7 @@ FileName NimBuildConfigurationFactory::defaultBuildDirectory(const Kit *k,
{ {
QFileInfo projectFileInfo(projectFilePath); QFileInfo projectFileInfo(projectFilePath);
ProjectMacroExpander expander(projectFileInfo.baseName(), k, bc, buildType); ProjectMacroExpander expander(projectFilePath, projectFileInfo.baseName(), k, bc, buildType);
QString buildDirectory = expander.expand(Core::DocumentManager::buildDirectory()); QString buildDirectory = expander.expand(Core::DocumentManager::buildDirectory());
if (FileUtils::isAbsolutePath(buildDirectory)) if (FileUtils::isAbsolutePath(buildDirectory))

6
src/plugins/projectexplorer/projectmacroexpander.cpp
View File

@@ -29,10 +29,14 @@
namespace ProjectExplorer { namespace ProjectExplorer {
ProjectMacroExpander::ProjectMacroExpander(const QString &projectName, ProjectMacroExpander::ProjectMacroExpander(const QString &mainFilePath, const QString &projectName,
const Kit *kit, const QString &bcName, const Kit *kit, const QString &bcName,
BuildConfiguration::BuildType buildType) BuildConfiguration::BuildType buildType)
{ {
registerFileVariables(Constants::VAR_CURRENTPROJECT_PREFIX,
QCoreApplication::translate("ProjectExplorer", "Main file of current project"),
[mainFilePath]() -> QString { return mainFilePath; });
registerVariable(Constants::VAR_CURRENTPROJECT_NAME, registerVariable(Constants::VAR_CURRENTPROJECT_NAME,
QCoreApplication::translate("ProjectExplorer", "Name of current project"), QCoreApplication::translate("ProjectExplorer", "Name of current project"),
[projectName] { return projectName; }); [projectName] { return projectName; });

4
src/plugins/projectexplorer/projectmacroexpander.h
View File

@@ -37,8 +37,8 @@ class Kit;
class PROJECTEXPLORER_EXPORT ProjectMacroExpander : public Utils::MacroExpander class PROJECTEXPLORER_EXPORT ProjectMacroExpander : public Utils::MacroExpander
{ {
public: public:
ProjectMacroExpander(const QString &projectName, const Kit *kit, const QString &bcName, ProjectMacroExpander(const QString &mainFilePath, const QString &projectName, const Kit *kit,
BuildConfiguration::BuildType buildType); const QString &bcName, BuildConfiguration::BuildType buildType);
}; };
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -398,7 +398,7 @@ static Utils::FileName defaultBuildDirectory(const QString &projectFilePath, con
BuildConfiguration::BuildType buildType) BuildConfiguration::BuildType buildType)
{ {
const QString projectName = QFileInfo(projectFilePath).completeBaseName(); const QString projectName = QFileInfo(projectFilePath).completeBaseName();
ProjectMacroExpander expander(projectName, k, bcName, buildType); ProjectMacroExpander expander(projectFilePath, projectName, k, bcName, buildType);
QString projectDir = Project::projectDirectory(Utils::FileName::fromString(projectFilePath)).toString(); QString projectDir = Project::projectDirectory(Utils::FileName::fromString(projectFilePath)).toString();
QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory());
return Utils::FileName::fromString(Utils::FileUtils::resolvePath(projectDir, buildPath)); return Utils::FileName::fromString(Utils::FileUtils::resolvePath(projectDir, buildPath));

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -78,7 +78,7 @@ QString QmakeBuildConfiguration::shadowBuildDirectory(const QString &proFilePath
return QString(); return QString();
const QString projectName = QFileInfo(proFilePath).completeBaseName(); const QString projectName = QFileInfo(proFilePath).completeBaseName();
ProjectMacroExpander expander(projectName, k, suffix, buildType); ProjectMacroExpander expander(proFilePath, projectName, k, suffix, buildType);
QString projectDir = Project::projectDirectory(FileName::fromString(proFilePath)).toString(); QString projectDir = Project::projectDirectory(FileName::fromString(proFilePath)).toString();
QString buildPath = expander.expand(Core::DocumentManager::buildDirectory()); QString buildPath = expander.expand(Core::DocumentManager::buildDirectory());
return FileUtils::resolvePath(projectDir, buildPath); return FileUtils::resolvePath(projectDir, buildPath);