diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 11:09:30 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 11:09:37 +0200 |
| commit | e062958e59129bb4cdfa2056f8023b1ba4dc9670 (patch) | |
| tree | 1fe3f4424a59f7e8317d29c50c8ffe8d46c498d6 /sources/shiboken2/generator/shiboken2/shibokengenerator.h | |
| parent | e479a2a973820e9d1bf6585e0640a334c8824038 (diff) | |
| parent | 67ac7e473e312298eeb2deb16f2a50644b5f76e7 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I47521e21977b1f17fcc65590f565270b2440a48b
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.h')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h index 497ff4e34..a8a270612 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h @@ -296,7 +296,8 @@ public: QString wrapperName(const AbstractMetaClass* metaClass) const; QString wrapperName(const AbstractMetaType *metaType) const; - static QString fullPythonFunctionName(const AbstractMetaFunction* func); + QString fullPythonFunctionName(const AbstractMetaFunction* func); + static QString protectedEnumSurrogateName(const AbstractMetaEnum* metaEnum); static QString protectedFieldGetterName(const AbstractMetaField* field); static QString protectedFieldSetterName(const AbstractMetaField* field); |