diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 09:05:57 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-09 12:30:06 +0000 |
| commit | 9b12737a39d41838a5c2278ddffde254565ec1c2 (patch) | |
| tree | 564a47b7ed64bb42d5b58e42f009f8d26c373eb5 | |
| parent | b149284a371f9cae62d76d0a0a4e22c8dff1f078 (diff) | |
Qt Designer plugin: Fix running from within QUiLoader
Prevent re-initialization of Python.
Fixes: PYSIDE-2222
Change-Id: I50d813479598aa160ed163eb4de50bb9e34b6f99
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit 2379fbd9f10255bba9ad3caaa8ccea17fc9cdfbf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/plugins/designer/designercustomwidgets.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sources/pyside6/plugins/designer/designercustomwidgets.cpp b/sources/pyside6/plugins/designer/designercustomwidgets.cpp index 5585c7d22..bebdd6a93 100644 --- a/sources/pyside6/plugins/designer/designercustomwidgets.cpp +++ b/sources/pyside6/plugins/designer/designercustomwidgets.cpp @@ -224,7 +224,9 @@ PyDesignerCustomWidgets::PyDesignerCustomWidgets(QObject *parent) : QObject(pare qputenv(pythonPathVar, value); } - initPython(); + // Might be initialized already, for example, when loaded from QUiLoader. + if (Py_IsInitialized() == 0) + initPython(); // Run all register*py files QString errorMessage; |