aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-04-21 11:39:20 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-04-21 13:06:49 +0000
commit27c00777d572e9c5255735af012a0c250c270c89 (patch)
tree2747e7ff3108053d7fcdea02cfee9cbd52105331 /share
parent8611fec71604fde8deee0863ab2bc8cdb4c618ea (diff)
QmlDesigner: Fix assert
Trying to serialize a void start using QVariant does assert. Solution: Ignore properties of type void star. This was triggered by TreeView. Change-Id: Idca5646a472fdfce8761861f5bf889bb73300fff Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index 8507d27eb0..edeb61e27a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -1048,7 +1048,7 @@ InformationChangedCommand NodeInstanceServer::createAllInformationChangedCommand
static bool supportedVariantType(int type)
{
return type < int(QVariant::UserType) && type != QMetaType::QObjectStar
- && type != QMetaType::QModelIndex;
+ && type != QMetaType::QModelIndex && type != QMetaType::VoidStar;
}
ValuesChangedCommand NodeInstanceServer::createValuesChangedCommand(const QList<ServerNodeInstance> &instanceList) const