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

Python: use the system environment of the project dir

Browse Source 
to expand variables in the python project files.

Change-Id: Iff8d2445bad9a7ae15e720b65ac5c894c8efdb02
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2023-06-06 10:12:13 +02:00
parent 4fa65c4a34
commit d548c973cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/python/pythonproject.cpp
View File

@@ -408,7 +408,7 @@ void PythonBuildSystem::parse()
* Expands environment variables in the given \a string when they are written * Expands environment variables in the given \a string when they are written
* like $$(VARIABLE). * like $$(VARIABLE).
*/ */
static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &string) static void expandEnvironmentVariables(const Environment &env, QString &string)
{ {
const QRegularExpression candidate("\\$\\$\\((.+)\\)"); const QRegularExpression candidate("\\$\\$\\((.+)\\)");
@@ -434,7 +434,7 @@ static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &
QStringList PythonBuildSystem::processEntries(const QStringList &paths, QStringList PythonBuildSystem::processEntries(const QStringList &paths,
QHash<QString, QString> *map) const QHash<QString, QString> *map) const
{ {
const QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); const Environment env = projectDirectory().deviceEnvironment();
const QDir projectDir(projectDirectory().toString()); const QDir projectDir(projectDirectory().toString());
QFileInfo fileInfo; QFileInfo fileInfo;