Further improve QQmlJSMetaPropertyBindings (2/N). Take 3

Make QQmlJSScope insert property bindings in the correct order.
We can do this by using some hackery:
- insert the element first through the QMultiMap interface
- query the non-const equal range and rotate first element to the end

The rotate is a bit slow, however, so let's do move left + copy-assign

Change-Id: I8f422c8a9105211fb016047c70b51b851c9873d8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h
index 2bb23ebf63..f3f3e1010e 100644
--- a/src/qmlcompiler/qqmljsscope_p.h
+++ b/src/qmlcompiler/qqmljsscope_p.h
@@ -242,6 +242,12 @@ public:
     void addOwnPropertyBinding(const QQmlJSMetaPropertyBinding &binding)
     {
         m_propertyBindings.insert(binding.propertyName(), binding);
+
+        // NB: insert() prepends \a binding to the list of bindings, but we need
+        // append, so rotate
+        using iter = typename QMultiHash<QString, QQmlJSMetaPropertyBinding>::iterator;
+        QPair<iter, iter> r = m_propertyBindings.equal_range(binding.propertyName());
+        std::rotate(r.first, std::next(r.first), r.second);
     }
     QMultiHash<QString, QQmlJSMetaPropertyBinding> ownPropertyBindings() const
     {