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

ProjectExplorer: Expose working directory to macro expanders

Browse Source 
Change-Id: I02ab3d4c4d850bc3c50186d4458b6a87d50a3926
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-14 17:19:04 +02:00
parent fd1ca5e06f
commit 348a7dadac
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/projectexplorerconstants.h
View File

@@ -186,6 +186,7 @@ const char VAR_CURRENTBUILD_NAME[] = "CurrentBuild:Name";
const char VAR_CURRENTBUILD_TYPE[] = "CurrentBuild:Type"; const char VAR_CURRENTBUILD_TYPE[] = "CurrentBuild:Type";
const char VAR_CURRENTBUILD_ENV[] = "CurrentBuild:Env"; const char VAR_CURRENTBUILD_ENV[] = "CurrentBuild:Env";
const char VAR_CURRENTRUN_NAME[] = "CurrentRun:Name"; const char VAR_CURRENTRUN_NAME[] = "CurrentRun:Name";
const char VAR_CURRENTRUN_WORKINGDIR[] = "CurrentRun:WorkingDir";
// JsonWizard: // JsonWizard:
const char PAGE_ID_PREFIX[] = "PE.Wizard.Page."; const char PAGE_ID_PREFIX[] = "PE.Wizard.Page.";

8
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -186,6 +186,14 @@ RunConfiguration::RunConfiguration(Target *target, Core::Id id)
const auto envAspect = aspect<EnvironmentAspect>(); const auto envAspect = aspect<EnvironmentAspect>();
return envAspect ? envAspect->environment().value(var) : QString(); return envAspect ? envAspect->environment().value(var) : QString();
}); });
expander->registerVariable(Constants::VAR_CURRENTRUN_WORKINGDIR,
tr("The currently active run configuration's working directory"),
[this, expander] {
const auto wdAspect = aspect<WorkingDirectoryAspect>();
return wdAspect ? wdAspect->workingDirectory(expander).toString() : QString();
});
expander->registerVariable(Constants::VAR_CURRENTRUN_NAME, expander->registerVariable(Constants::VAR_CURRENTRUN_NAME,
QCoreApplication::translate("ProjectExplorer", "The currently active run configuration's name."), QCoreApplication::translate("ProjectExplorer", "The currently active run configuration's name."),
[this] { return displayName(); }, false); [this] { return displayName(); }, false);