Skip to content

Commit 833a9ec

Browse files
authored
Merge pull request #15 from matsjoyce-refeyn/bugfix/fix-slot-return-types
Fix slot return type becoming void for simple types; Update to Qt 6.9.3
2 parents 9d7de28 + e9f5b26 commit 833a9ec

25 files changed

+27
-4
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- os: ubuntu-latest
2323
pyside6_version: 6.7.3
2424
- os: ubuntu-latest
25-
pyside6_version: 6.9.0
25+
pyside6_version: 6.9.3
2626
build_wheel: true
2727
runs-on: ${{ matrix.os }}
2828
name: "Test on ${{ matrix.os }} with PySide6 ${{ matrix.pyside6_version }}"

conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

pyside6_qml_stubgen/pyside_patching.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def Slot(
327327
result: type | str | None = None,
328328
**kwargs: typing.Any,
329329
) -> typing.Callable:
330-
slot = old_fn(*types, **kwargs)
330+
slot = old_fn(*types, **kwargs, result=result)
331331

332332
def w(f: typing.Callable) -> typing.Callable:
333333
info.signal_types[f] = (types, result) # type: ignore[index]

tests/reference/6.7.3/target/types1-0.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,12 @@
239239
"name": "slot2",
240240
"arguments": [],
241241
"returnType": "Uncreatable*"
242+
},
243+
{
244+
"access": "public",
245+
"name": "slot3",
246+
"arguments": [],
247+
"returnType": "bool"
242248
}
243249
]
244250
}

tests/reference/6.7.3/target/types1-0.qmltypes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ Module {
131131
Parameter { name: "z"; type: "Normal"; isPointer: true }
132132
}
133133
Method { name: "slot2"; type: "Uncreatable"; isPointer: true }
134+
Method { name: "slot3"; type: "bool" }
134135
}
135136
Component {
136137
file: "in/clses.py"

tests/reference/6.8.3/target/types1-0.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,12 @@
239239
"name": "slot2",
240240
"arguments": [],
241241
"returnType": "Uncreatable*"
242+
},
243+
{
244+
"access": "public",
245+
"name": "slot3",
246+
"arguments": [],
247+
"returnType": "bool"
242248
}
243249
]
244250
}

tests/reference/6.8.3/target/types1-0.qmltypes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Module {
102102
Parameter { name: "z"; type: "Normal"; isPointer: true }
103103
}
104104
Method { name: "slot2"; type: "Uncreatable"; isPointer: true }
105+
Method { name: "slot3"; type: "bool" }
105106
}
106107
Component {
107108
file: "in/clses.py"
File renamed without changes.

tests/reference/6.9.0/target/advanced/qmltyperegistrations1-100.cpp renamed to tests/reference/6.9.3/target/advanced/qmltyperegistrations1-100.cpp

File renamed without changes.

0 commit comments

Comments
 (0)