diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-25 11:18:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-25 13:09:27 +0200 |
| commit | 73fa249c298f72548e8d728ec33aa802b1016e10 (patch) | |
| tree | a71875378aa68eaf4cc2c721ca6fb97b91eb2ba8 | |
| parent | b8ea2fb18c6994f9a55d28ea6d7b2e235a417077 (diff) | |
abstractmetabuilder_p.h: Fix compilation with some versions of g++
Fix the return type, which caused complaints by some versions of g++:
sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h: In member function 'ScopeModelItem AbstractMetaBuilderPrivate::popScope()':
sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h:61:57: error: could not convert 'QList<T>::takeLast() [with T = QSharedPointer<_NamespaceModelItem>]()' from 'QSharedPointer<_NamespaceModelItem>' to 'QSharedPointer<_ScopeModelItem>'
Change-Id: I94abdfb9d76d3f0078e198b4230129150d2f43ea
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h index 9b1b181cc..18c5afc17 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h @@ -56,7 +56,7 @@ public: void dumpLog() const; AbstractMetaClassList classesTopologicalSorted(const AbstractMetaClassList &classList, const Dependencies &additionalDependencies = Dependencies()) const; - ScopeModelItem popScope() { return m_scopes.takeLast(); } + NamespaceModelItem popScope() { return m_scopes.takeLast(); } void pushScope(const NamespaceModelItem &item); |