diff options
| author | Christian Tismer <tismer@stackless.com> | 2021-04-18 18:58:18 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2021-11-12 11:57:01 +0100 |
| commit | 310d18f3708d891c9e99f8a9a713f5a0ce45d341 (patch) | |
| tree | ac047ad6f2f072b6e332eda888d7b26456319de1 /sources/pyside6/libpyside/pyside.cpp | |
| parent | 225bf1aaa5a17f8f3c2526f03a10223ea14de239 (diff) | |
PyPySide: check in the rest of PyPy changes
The PyPy branch has been apart from the main branch for a
long time. Meanwhile, almost everything has settled and can
be merged into the main branch.
This has the advantage of a single branch for both
configurations.
This project is still not ready. It will be called ready when
the Mandelbrot example can be run without any changes.
To achieve that, the current threading problem must be solved.
The WIP branch is kept. It now holds only the pypy-blog.txt file.
Task-number: PYSIDE-535
Change-Id: I317b0e921cc6810e1b76c69991a0f8e592135c65
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 17c673149..51353afe2 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -571,8 +571,13 @@ bool registerInternalQtConf() // PyInstaller executable. // This will disable the internal qt.conf which points to the PySide6 subdirectory (due to the // subdirectory not existing anymore). +#ifndef PYPY_VERSION QString executablePath = QString::fromWCharArray(Py_GetProgramFullPath()); +#else + // PYSIDE-535: FIXME: Add this function when available. + QString executablePath = QLatin1String("missing Py_GetProgramFullPath"); +#endif // PYPY_VERSION QString appDirPath = QFileInfo(executablePath).absolutePath(); QString maybeQtConfPath = QDir(appDirPath).filePath(QStringLiteral("qt.conf")); bool executableQtConfAvailable = QFileInfo::exists(maybeQtConfPath); |