diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-11 10:37:50 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-16 15:20:10 +0000 |
commit | 9b7411b644273c644331b99fc35d1f1460f9fcec (patch) | |
tree | 62036e1a89bef16c8d9ddbb2a8e7481209440038 /.gitattributes | |
parent | b8ebeeb81ce599a9afeef996faaf2f1463ab5981 (diff) |
shiboken6: Fix duplicate indexes for template instantiations
For a typedef "using Foo=QList<int>", shiboken generates SBK_QLIST_INT
besides SBK_FOO which is then matched by function arguments. The code
was however missing a check to restrict this to typedefs, so it
triggered for
class Alternative : public QVariantList,
class Sequence : public QVariantList
producing duplicate indexes.
Restrict this to real typedefs (which are also represented as classes.
Split out the function creating the special alternate index for
clarity and add a check for potential equivalent typedefs which would
also produce clashes.
Task-number: PYSIDE-1571
Change-Id: I9275963c4ddb8fc589e414ee1fa19282f6004793
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 42c0854f077d004dba43b713ec2cabb76747a270)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions