diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-06 10:42:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-06 11:17:34 +0000 |
| commit | b20dfab4bc9a4887160e359b8d23dd25760ff948 (patch) | |
| tree | 8c610279530feaf5a526495e4a8431c55ee1012a /sources/shiboken2/ApiExtractor/parser/codemodel.cpp | |
| parent | 5dec41a724e9967c27eec0a7a0bc36a0b718d310 (diff) | |
shiboken: Fix handling of deleted functions
Check the cursor availability to detect deleted functions. This fixes
the build of the Qt 5.12 API, which for the first time has a
Q_DISABLE(QCBorStreamReader) in a public section, causing a copy
constructor to be reported.
Task-number: PYSIDE-487
Change-Id: I31ba0103cf612a4238c0e282ffcfeeab29df97d1
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/parser/codemodel.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/parser/codemodel.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp index 60a699337..d862692dd 100644 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp @@ -896,6 +896,26 @@ void _FunctionModelItem::setVariadics(bool isVariadics) m_isVariadics = isVariadics; } +bool _FunctionModelItem::isDeleted() const +{ + return m_isDeleted; +} + +void _FunctionModelItem::setDeleted(bool d) +{ + m_isDeleted = d; +} + +bool _FunctionModelItem::isDeprecated() const +{ + return m_isDeprecated; +} + +void _FunctionModelItem::setDeprecated(bool d) +{ + m_isDeprecated = d; +} + bool _FunctionModelItem::isVirtual() const { return m_isVirtual; @@ -972,12 +992,16 @@ void _FunctionModelItem::formatDebug(QDebug &d) const { _MemberModelItem::formatDebug(d); d << ", type=" << m_functionType; + if (m_isDeleted) + d << " [deleted!]"; if (m_isInline) d << " [inline]"; if (m_isVirtual) d << " [virtual]"; if (m_isOverride) d << " [override]"; + if (m_isDeprecated) + d << " [deprecated]"; if (m_isFinal) d << " [final]"; if (m_isAbstract) |