diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-16 13:45:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-17 10:52:51 +0200 |
commit | 1bca8bf41719a051df7304101b48ca1db6112088 (patch) | |
tree | c5c2278f721110daf5dbfc705288b1e9f8a4490c /sources/shiboken2/ApiExtractor/typesystem.h | |
parent | d2be09eef06241cd4c9eb7a0ca1a993dc2355f02 (diff) | |
parent | c121c29952f3070e110dc9a9c86bf5fd41c14d92 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.14.2"
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typesystem.h')
-rw-r--r-- | sources/shiboken2/ApiExtractor/typesystem.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h index 8d8d60f3f..4d0a23ca1 100644 --- a/sources/shiboken2/ApiExtractor/typesystem.h +++ b/sources/shiboken2/ApiExtractor/typesystem.h @@ -1219,8 +1219,7 @@ class ComplexTypeEntry : public TypeEntry { public: enum TypeFlag { - Deprecated = 0x4, - NoOverrideCaching = 0x8 + Deprecated = 0x4 }; Q_DECLARE_FLAGS(TypeFlags, TypeFlag) |