Commit 2ce58f0
committed
m2k: fix Qt6 removed APIs and module compatibility
- Remove qRegisterMetaTypeStreamOperators calls (auto-registered in Qt6)
- Fix QLabel::setNum overload ambiguity in powercontrol.ui by moving
the connection to code with qOverload<int> disambiguation
- Qt3DRender/QGeometry -> Qt3DCore/QGeometry (moved in Qt6)
- Qt3DRender/QAttribute -> Qt3DCore/QAttribute (moved in Qt6)
Signed-off-by: IonutMuthi <Ionut.Muthi@analog.com>1 parent c9aaa07 commit 2ce58f0
File tree
5 files changed
+4
-30
lines changed- packages
- imu/plugins/imuanalyzer/include/imuanalyzer
- m2k/plugins/m2k
- src/old
- logicanalyzer
- patterngenerator
- ui
5 files changed
+4
-30
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
Lines changed: 0 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
74 | 73 | | |
75 | | - | |
76 | 74 | | |
77 | | - | |
78 | 75 | | |
79 | 76 | | |
80 | | - | |
81 | 77 | | |
82 | 78 | | |
83 | | - | |
84 | 79 | | |
85 | | - | |
86 | 80 | | |
87 | 81 | | |
88 | 82 | | |
| |||
Lines changed: 0 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | 55 | | |
57 | | - | |
58 | 56 | | |
59 | 57 | | |
60 | | - | |
61 | 58 | | |
62 | | - | |
63 | | - | |
64 | 59 | | |
65 | 60 | | |
66 | 61 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1150 | 1150 | | |
1151 | 1151 | | |
1152 | 1152 | | |
1153 | | - | |
1154 | | - | |
1155 | | - | |
1156 | | - | |
1157 | | - | |
1158 | | - | |
1159 | | - | |
1160 | | - | |
1161 | | - | |
1162 | | - | |
1163 | | - | |
1164 | | - | |
1165 | | - | |
1166 | | - | |
1167 | | - | |
1168 | | - | |
1169 | | - | |
| 1153 | + | |
1170 | 1154 | | |
1171 | 1155 | | |
1172 | 1156 | | |
| |||
0 commit comments