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

MacroExpander: Fall back to global expander

Browse Source 
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-10-15 14:45:31 +02:00
parent 89602419c4
commit ef563d8085
30 changed files with 154 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/processparameters.h
View File

@@ -35,7 +35,7 @@
#include <utils/environment.h>
namespace Utils { class AbstractMacroExpander; }
namespace Utils { class MacroExpander; }
namespace ProjectExplorer {
@@ -57,8 +57,8 @@ public:
void setEnvironment(const Utils::Environment &env) { m_environment = env; }
Utils::Environment environment() const { return m_environment; }
void setMacroExpander(Utils::AbstractMacroExpander *mx) { m_macroExpander = mx; }
Utils::AbstractMacroExpander *macroExpander() const { return m_macroExpander; }
void setMacroExpander(Utils::MacroExpander *mx) { m_macroExpander = mx; }
Utils::MacroExpander *macroExpander() const { return m_macroExpander; }
/// Get the fully expanded working directory:
QString effectiveWorkingDirectory() const;
@@ -81,7 +81,7 @@ private:
QString m_command;
QString m_arguments;
Utils::Environment m_environment;
Utils::AbstractMacroExpander *m_macroExpander;
Utils::MacroExpander *m_macroExpander;
mutable QString m_effectiveWorkingDirectory;
mutable QString m_effectiveCommand;