diff options
Diffstat (limited to 'dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch')
| -rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch index ccfb43102e97..c3ce88d065ef 100644 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch +++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch @@ -1,18 +1,8 @@ -Note that this is a non-official backport which required a bit -of adaptation to work with 6.10.3, seems to work but possible -overlooked something. - https://bugs.gentoo.org/973374 https://codereview.qt-project.org/c/qt%2Fqtdeclarative/+/733089 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp -@@ -5,4 +5,5 @@ - #include "qqmltypecompiler_p.h" - -+#include <iterator> - #include <private/qqmlobjectcreator_p.h> - #include <private/qqmlcustomparser_p.h> -@@ -919,13 +920,12 @@ +@@ -919,12 +919,11 @@ // Apply the ordering in the IR obj->setFirstAlias(ordered[0]); - if (ordered[0] == defaultPropertyAlias) @@ -24,10 +14,9 @@ https://codereview.qt-project.org/c/qt%2Fqtdeclarative/+/733089 - obj->indexOfDefaultPropertyOrAlias = i; - } ordered.last()->next = nullptr; - + if (defaultPropertyAlias) { + auto it = std::find(ordered.constBegin(), ordered.constEnd(), defaultPropertyAlias); + obj->indexOfDefaultPropertyOrAlias = std::distance(ordered.constBegin(), it); + } + return true; - } |