aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/libpyside/class_property.h2
-rw-r--r--sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/sources/pyside6/libpyside/class_property.h b/sources/pyside6/libpyside/class_property.h
index 4942e0ef3..f2ed29f1f 100644
--- a/sources/pyside6/libpyside/class_property.h
+++ b/sources/pyside6/libpyside/class_property.h
@@ -27,7 +27,7 @@ struct propertyobject310 {
// Note: This is a problem with Limited API: We have no direct access.
// You need to pick it from runtime info.
PyObject *prop_name;
- int getter_doc;
+ int getter_doc;
};
PYSIDE_API PyTypeObject *PyClassProperty_TypeF();
diff --git a/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py b/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py
index 26b9d8467..3a54e2b88 100644
--- a/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py
+++ b/sources/pyside6/tests/tools/pyside6-deploy/test_pyside6_deploy.py
@@ -26,6 +26,10 @@ class ConfigFile:
class TestPySide6Deploy(unittest.TestCase):
@classmethod
def setUpClass(cls):
+ # PYSIDE-2230: A temporary patch that avoids the pyenv error.
+ # The final solution is too much for this quick fix.
+ if os.environ.get("PYENV_ROOT"):
+ del os.environ["PYENV_ROOT"]
cls.pyside_root = Path(__file__).parents[5].resolve()
example_root = cls.pyside_root / "examples"
example_widgets = example_root / "widgets" / "widgets" / "tetrix"