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

Utils: Use EnvironmentChange instead of Environment in several places

Browse Source 
For path choosers this makes it easier to change the actual base retrospectively
based on the device for the file path entered by the user.

In other cases "end user code" only knows that something needs to
be added to PATH to get a proper environment. This here lets this
code to specify the change alone without bothering about the base
environment this might be applied to.

Change-Id: I726aaa2fd2feb0bee7158f601aac660b0ac6327b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-08-03 15:12:24 +02:00
parent 6405f9c436
commit 6418eb2dda
13 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/utils/pathchooser.cpp
View File

@@ -191,7 +191,7 @@ public:
FilePath m_initialBrowsePathOverride;
QString m_defaultValue;
FilePath m_baseDirectory;
Environment m_environment;
EnvironmentChange m_environmentChange;
BinaryVersionToolTipEventFilter *m_binaryVersionToolTipEventFilter = nullptr;
QList<QAbstractButton *> m_buttons;
MacroExpander *m_macroExpander = globalMacroExpander();
@@ -209,18 +209,22 @@ FilePath PathChooserPrivate::expandedPath(const QString &input) const
if (input.isEmpty())
return {};
QString expandedInput = m_environment.expandVariables(input);
if (m_macroExpander)
expandedInput = m_macroExpander->expand(expandedInput);
FilePath path = FilePath::fromUserInput(input);
Environment env = path.deviceEnvironment();
m_environmentChange.applyToEnvironment(env);
path = env.expandVariables(path);
if (m_macroExpander)
path = m_macroExpander->expand(path);
const FilePath path = FilePath::fromUserInput(expandedInput);
if (path.isEmpty())
return path;
switch (m_acceptingKind) {
case PathChooser::Command:
case PathChooser::ExistingCommand: {
FilePaths searchPaths = m_environment.path();
FilePaths searchPaths = env.path();
searchPaths.append(m_baseDirectory);
const FilePath expanded = path.searchOnDevice(searchPaths);
return expanded.isEmpty() ? path : expanded;
@@ -277,7 +281,6 @@ PathChooser::PathChooser(QWidget *parent) :
setLayout(d->m_hLayout);
setFocusProxy(d->m_lineEdit);
setFocusPolicy(d->m_lineEdit->focusPolicy());
setEnvironment(Environment::systemEnvironment());
d->m_lineEdit->setValidationFunction(defaultValidationFunction());
}
@@ -328,10 +331,10 @@ FilePath PathChooser::baseDirectory() const
return d->m_baseDirectory;
}
void PathChooser::setEnvironment(const Environment &env)
void PathChooser::setEnvironmentChange(const EnvironmentChange &env)
{
QString oldExpand = filePath().toString();
d->m_environment = env;
d->m_environmentChange = env;
if (filePath().toString() != oldExpand) {
triggerChanged();
emit rawPathChanged(rawPath());