mirror of
https://invent.kde.org/multimedia/kdenlive
synced 2025-12-06 16:29:58 +01:00
Compare commits
2 Commits
v25.08.1
...
work/embed
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd573f9f84 | ||
|
|
d6640ce2d8 |
@@ -257,7 +257,17 @@ QString AbstractPythonInterface::systemPythonExec()
|
|||||||
deps.close();
|
deps.close();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
const QString path = QStandardPaths::findExecutable(pythonName);
|
|
||||||
|
// On Windows, Mac and AppImage, use our packaged python
|
||||||
|
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
|
||||||
|
QStringList paths = {qApp->applicationDirPath()};
|
||||||
|
#else
|
||||||
|
QStringList paths;
|
||||||
|
if (pCore->packageType() == LinuxPackageType::AppImage) {
|
||||||
|
paths << qApp->applicationDirPath();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
const QString path = QStandardPaths::findExecutable(pythonName, paths);
|
||||||
if (path.isEmpty()) {
|
if (path.isEmpty()) {
|
||||||
setStatus(Broken);
|
setStatus(Broken);
|
||||||
Q_EMIT setupError(i18n("Cannot find %1, please install it on your system.\n"
|
Q_EMIT setupError(i18n("Cannot find %1, please install it on your system.\n"
|
||||||
@@ -408,7 +418,8 @@ bool AbstractPythonInterface::setupVenv()
|
|||||||
QProcess envProcess;
|
QProcess envProcess;
|
||||||
// For some reason, this fails in AppImage, but when extracting the Appimage it works...
|
// For some reason, this fails in AppImage, but when extracting the Appimage it works...
|
||||||
// No workaround found yet for AppImage
|
// No workaround found yet for AppImage
|
||||||
QStringList args = {QStringLiteral("-m"), QStringLiteral("venv"), pluginDir.absoluteFilePath(getVenvPath())};
|
QStringList args = {QStringLiteral("-m"), QStringLiteral("venv"), pluginDir.absoluteFilePath(getVenvPath()), QStringLiteral("--upgrade-deps"),
|
||||||
|
QStringLiteral("--copies")};
|
||||||
envProcess.start(pythonExec, args);
|
envProcess.start(pythonExec, args);
|
||||||
envProcess.waitForStarted();
|
envProcess.waitForStarted();
|
||||||
envProcess.waitForFinished(-1);
|
envProcess.waitForFinished(-1);
|
||||||
|
|||||||
Reference in New Issue
Block a user