diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:58:53 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-24 12:59:22 +0200 |
commit | 2c3cbe854f921068346ee78f7dda841116230ede (patch) | |
tree | acb00b4202ffaab3b565348a530f3ae0f919a555 /sources/pyside2/libpyside/pysideqflags.cpp | |
parent | 0cf22cc9f74594252bd744d6aee77cd3ee3ae0e8 (diff) | |
parent | e24392c76e5cfdd2d6d51bd853b106db2bc4cb80 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
Diffstat (limited to 'sources/pyside2/libpyside/pysideqflags.cpp')
-rw-r--r-- | sources/pyside2/libpyside/pysideqflags.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp index f4263403b..7a8fa2a05 100644 --- a/sources/pyside2/libpyside/pysideqflags.cpp +++ b/sources/pyside2/libpyside/pysideqflags.cpp @@ -54,7 +54,7 @@ extern "C" { */ struct PySideQFlagsType { - PepTypeObject type; + PyTypeObject type; }; #define PYSIDE_QFLAGS(X) reinterpret_cast<PySideQFlagsObject*>(X) |