Commit d9b934a1 authored by Simon Hausmann's avatar Simon Hausmann Committed by The Qt Project
Browse files

Fix regression in QML string list concatenations


String lists and other QList property types (wrapped as QQmlSequence) should
behave like arrays and have the Array prototype. Therefore it should be
possible to pass them also as parameter to concat and they get composed
correctly, i.e. the individual items get appended instead of the list being
appened as one item. In the spec for concat this "special" casing should be
applied if the "class internal property" is "Array", and concat appears to be
the only place where this check is done. Therefore this patch adds another
exception to match the expected behavior in QML and extends the "internal
class is Array" meaning to QML list types.

This is a regression from Qt <= 5.1.x

Task-number: QTBUG-33149

Change-Id: Iab9522ac3c4ae6b746e790a99d87501b1cc1b655
Reviewed-by: default avatarMichael Brasser <michael.brasser@live.com>
Reviewed-by: default avatarLars Knoll <lars.knoll@digia.com>
parent 3ca143e2
Branches
Tags
No related merge requests found
Showing with 28 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment