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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8
This commit is contained in:
Eike Ziller
2024-02-29 12:44:58 +01:00
parent 5af531cd39 49ab0c4109
commit 6c2df76737
104 changed files with 2545 additions and 1567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/python/pythonkitaspect.cpp
View File

@@ -117,11 +117,11 @@ public:
if (!pipIsUsable(path)) {
result << BuildSystemTask(
Task::Warning,
Tr::tr("Python \"%1\" does not contain a usable pip. Pip is used to install "
"python "
"packages from the Python Package Index, like PySide and the python "
"language server. If you want to use any of that functionality "
"ensure pip is installed for that python.")
Tr::tr("Python \"%1\" does not contain a usable pip. pip is needed to install "
"Python "
"packages from the Python Package Index, like PySide and the Python "
"language server. To use any of that functionality "
"ensure that pip is installed for that Python.")
.arg(path.toUserOutput()));
}
if (!venvIsUsable(path)) {
@@ -130,7 +130,7 @@ public:
Tr::tr(
"Python \"%1\" does not contain a usable venv. venv is the recommended way "
"to isolate a development environment for a project from the globally "
"installed python.")
"installed Python.")
.arg(path.toUserOutput()));
}
}