aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-04-06 12:21:42 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-04-06 13:10:04 +0000
commiteb172fbbd42bfe07d3a4e4732c228ed017cbc806 (patch)
tree1abb0d8823d1e4d302636ea515ad76b15b04a76e /share
parent16894251278b0d575cd8b5695724e88d1026b103 (diff)
QmlDesigner: Fix assert
Trying to serialize a QModelIndex using QVariant does assert. Solution: Ignore properties of type QModelIndex. Change-Id: Idca5646a472fdfce8761861f5bf889bb73340df7 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index f475ca338a..8507d27eb0 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -1047,7 +1047,8 @@ InformationChangedCommand NodeInstanceServer::createAllInformationChangedCommand
static bool supportedVariantType(int type)
{
- return type < int(QVariant::UserType) && type != QMetaType::QObjectStar;
+ return type < int(QVariant::UserType) && type != QMetaType::QObjectStar
+ && type != QMetaType::QModelIndex;
}
ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList<ServerNodeInstance> &instanceList) const