diff options
| author | David Schulz <david.schulz@qt.io> | 2023-06-06 10:12:13 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2023-06-09 11:37:12 +0000 |
| commit | d548c973cf972b71f8f664dc1806ef2c8adffb32 (patch) | |
| tree | 12d525c7a32717278c4512566e02661ac8d4de4d /src/plugins/python/pythonproject.cpp | |
| parent | 4fa65c4a34274e2c1fee3f070db9056d1a6c9b14 (diff) | |
Python: use the system environment of the project dir
to expand variables in the python project files.
Change-Id: Iff8d2445bad9a7ae15e720b65ac5c894c8efdb02
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/python/pythonproject.cpp')
| -rw-r--r-- | src/plugins/python/pythonproject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp index 22990e7de0e..8237eff1858 100644 --- a/src/plugins/python/pythonproject.cpp +++ b/src/plugins/python/pythonproject.cpp @@ -408,7 +408,7 @@ void PythonBuildSystem::parse() * Expands environment variables in the given \a string when they are written * like $$(VARIABLE). */ -static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &string) +static void expandEnvironmentVariables(const Environment &env, QString &string) { const QRegularExpression candidate("\\$\\$\\((.+)\\)"); @@ -434,7 +434,7 @@ static void expandEnvironmentVariables(const QProcessEnvironment &env, QString & QStringList PythonBuildSystem::processEntries(const QStringList &paths, QHash<QString, QString> *map) const { - const QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + const Environment env = projectDirectory().deviceEnvironment(); const QDir projectDir(projectDirectory().toString()); QFileInfo fileInfo; |