diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-02-19 13:19:09 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-03-16 09:51:21 +0100 |
| commit | b5f4b92b36f4957452cb0df7ead79d270bc568b5 (patch) | |
| tree | a081231d01e68741e32e28a43d97ec7082fbd2dc /src/qml/qml/qqmlimport_p.h | |
| parent | f9ce66f1218beba5e88ae2137520a1516e40007f (diff) | |
Prefer Inline Components over any other imported name
After processing all other imports, there might be other imports both
in front and behind of the inline component imports in the import list.
To avoid having to search for them, we sort the list so that they are
in front.
Fixes: QTBUG-82302
Change-Id: I9f6deb03608b1ebd0cbe0eddd1a1e5d39837a783
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 2e994fd27f..594eae7bb4 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -122,7 +122,12 @@ public: QHashedString prefix; // Used by QQmlImportsPrivate::qualifiedSets + // set to this in unqualifiedSet to indicate that the lists of imports needs + // to be sorted when an inline component import was added + // We can't use flag pointer, as that does not work with QFieldList QQmlImportNamespace *nextNamespace; + bool needsSorting() const; + void setNeedsSorting(bool needsSorting); }; class Q_QML_PRIVATE_EXPORT QQmlImports |