diff options
| author | Matthew Woehlke <matthew.woehlke@kitware.com> | 2013-10-02 16:25:35 -0400 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2013-10-09 04:23:14 +0200 |
| commit | e95be43deb8ace9da4ea67022b4d4a5648d35f01 (patch) | |
| tree | 75154b975838ba2cc28cb2d805a79bfe5e878f2f | |
| parent | 1aeeae8382cc9ed5d8c03dd168c8566b6594d399 (diff) | |
Revert "Remove useless code."
This reverts commit 02c6e63ac8dbb8acde3bc19abd36fff0db65fd11. Apparently
types derived from containers can have a container base class without
the container class having a metaclass.
This fixes the sample_strlist unit test crashing. (There may be another
bug here, in Shiboken's don't-write-generated-source-if-not-changed
logic, as the failure doesn't seem to reliably appear/disappear after an
incremental build.)
Change-Id: I5f60bfb784dca02d9766a32e7b7b8a8a529df5af
Reviewed-by: John Ehresman <jpe@wingware.com>
| -rw-r--r-- | ApiExtractor/abstractmetabuilder.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ApiExtractor/abstractmetabuilder.cpp b/ApiExtractor/abstractmetabuilder.cpp index 0b9441490..ce7600e13 100644 --- a/ApiExtractor/abstractmetabuilder.cpp +++ b/ApiExtractor/abstractmetabuilder.cpp @@ -1651,6 +1651,9 @@ bool AbstractMetaBuilder::setupInheritance(AbstractMetaClass *metaClass) metaClass->typeEntry()->setBaseContainerType(templ->typeEntry()); return true; } + ComplexTypeEntry* baseContainerType = types->findContainerType(baseName); + if (baseContainerType) + metaClass->typeEntry()->setBaseContainerType(baseContainerType); } ReportHandler::warning(QString("template baseclass '%1' of '%2' is not known") |