diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-10-13 15:22:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 16:06:52 +0100 |
| commit | a1f368a504f1c465cdf85dbc137db4880a09738a (patch) | |
| tree | 72e8392c1cba8bfef1ed249de718387cea36f2db /sources/pyside-tools | |
| parent | 50c3f36955e72302633c1d9956506dbd1f158012 (diff) | |
Adapt to Qt 6.5
- Add new enums
- Hide field QMetaMethod::mobj made protected by
qtbase/0b701ec0cd86afbf6bb0d0abb361cfb6500c2e1b
- Adapt to PDF qtwebengine/6769bd1544c56a514fe35bf16d05614605a49bea
- Adapt to qhttpserver/55d10201dc7a47b239825548e053c1fb0de61115,
adding a virtual method with rvalue reference to QAbstractHttpServer
- create_wheels.py: Adapt to changed location of the metatypes directory
in Qt after qtbase/4234ce12dc819b9ca76c8dc4c251f5bd4fe0bc9c.
- Adapt error column in QDomDocument test
- Fix QMetaObject::invoke() to work after
qtbase/fe92b080658f0d8609e2a2a69e5ec2b51dd7bf9d by making the
cast of the helper types to Q(Generic)ReturnArgument explicit
in the snippets
Change-Id: Ifb514878e999ad4c9ef00ff83172626eff112a3d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'sources/pyside-tools')
| -rw-r--r-- | sources/pyside-tools/project/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside-tools/project/utils.py b/sources/pyside-tools/project/utils.py index db92aeb7f..b3fd03584 100644 --- a/sources/pyside-tools/project/utils.py +++ b/sources/pyside-tools/project/utils.py @@ -81,7 +81,7 @@ def qt_metatype_json_dir() -> Path: qt_dir = package_dir() if sys.platform != "win32": qt_dir /= "Qt" - metatypes_dir = qt_dir / "lib" / "metatypes" + metatypes_dir = qt_dir / "metatypes" if metatypes_dir.is_dir(): # Fully installed case _qt_metatype_json_dir = metatypes_dir else: @@ -89,7 +89,7 @@ def qt_metatype_json_dir() -> Path: print( f"Falling back to {QTPATHS_CMD} to determine metatypes directory.", file=sys.stderr ) - _qt_metatype_json_dir = Path(qtpaths()["QT_INSTALL_LIBS"]) / "metatypes" + _qt_metatype_json_dir = Path(qtpaths()["QT_INSTALL_ARCHDATA"]) / "metatypes" return _qt_metatype_json_dir |