diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-19 19:22:16 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-21 19:55:06 +0000 |
| commit | 9db650523b194ced96c6d05517a4eee8a834506e (patch) | |
| tree | b813cd16f7742fd5a073b8a3c340369552d9f2b9 /sources/shiboken6/ApiExtractor/apiextractor.cpp | |
| parent | c10f26137f5a577f6412df0429a14b92179e6b1a (diff) | |
shiboken6: Do not sort classes unnecessarily
The list of classes was first sorted topologically, then
alphabetically in the AbstractMetaBuilder and finally again
topologically in the CppGenerator with an additional dependency
QObiect/QMetaObject.
Move the sort functionality taking the QObiect/QMetaObject
dependency into account from the generator to the AbstractMetaBuilder.
Move all sorting functionality to helper sortLists().
The classesTopologicalSorted() helper is then no longer needed by
the generators and can be removed from the ApiExtractor.
Change-Id: I03c799118296393bdd0f3de84427b50ab29153b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 638bc0e5e8f0400411c6ba0fb40ddcde6d3a7c40)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/apiextractor.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/apiextractor.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sources/shiboken6/ApiExtractor/apiextractor.cpp b/sources/shiboken6/ApiExtractor/apiextractor.cpp index 02f376bdb..019f3db48 100644 --- a/sources/shiboken6/ApiExtractor/apiextractor.cpp +++ b/sources/shiboken6/ApiExtractor/apiextractor.cpp @@ -146,13 +146,6 @@ const AbstractMetaClassList &ApiExtractor::smartPointers() const return m_builder->smartPointers(); } -AbstractMetaClassList ApiExtractor::classesTopologicalSorted(const Dependencies &additionalDependencies) const -{ - Q_ASSERT(m_builder); - return AbstractMetaBuilder::classesTopologicalSorted(m_builder->classes(), - additionalDependencies); -} - PrimitiveTypeEntryList ApiExtractor::primitiveTypes() const { return TypeDatabase::instance()->primitiveTypes(); |