summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-11 17:19:14 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-19 08:44:15 +0000
commit5f49b2b3bb30678a26341e1f45e0cfd6a6fd2c57 (patch)
tree401948a4e6ba81d01860da5f2e57150412e72128 /dist
parent6a02fb09af8dce6ca533e816d2223e070b30f294 (diff)
QML Settings: fix JS array handling
Before Qt 5.4, JS arrays were passed as QVariantLists. Since Qt 5.4, they are passed as QJSValues instead. Use QJSValue::toVariant() (the same way as QQuickItemView::setModel(QVariant) which was fixed in cf959b4b) to convert JS values to QSettings-compatible variants. Task-number: QTBUG-45316 Change-Id: Icc6f8ad09bfef089d9efcf5b90e3783bb3f73a9f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-5.9.01
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
index f6c6aebea9..7cd655e384 100644
--- a/dist/changes-5.9.0
+++ b/dist/changes-5.9.0
@@ -43,6 +43,7 @@ QtQml
to allow getting the actual storage path for a particular database.
- [QTBUG-53091] Introduced Qt.application.displayName, to map the
QGuiApplication::applicationDisplayName property to QML.
+ - [QTBUG-45316] QML Settings has been fixed to handle JavaScript arrays.
QtQuick
-------