diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-04-04 13:18:14 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-04-05 11:09:07 +0000 |
| commit | b0af88c0dd1b7bbe66c1c9eccb55f4bf9fd7937b (patch) | |
| tree | d168a5c913f7e56802d00b5bf605d01baa0861ee /share | |
| parent | 3c2f408963c286cf21a7c43993c793e38e503370 (diff) | |
Fixing crasing Timer
A "raw" QObject (created instead of the Timer) will crash the engine later. Instead we setup
the QObject using createPrimitive().
Task-number: QTCREATORBUG-15916
Change-Id: I5f0dd9c887fd57d492222d221e54f267e12a5044
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp index 155aeb4aad..898170ad93 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp @@ -217,7 +217,7 @@ ServerNodeInstance ServerNodeInstance::create(NodeInstanceServer *nodeInstanceSe if (object == 0) object = new QQuickItem; } else { - object = new QObject; + object = Internal::ObjectNodeInstance::createPrimitive("QtQml/QtObject", 2, 0, nodeInstanceServer->context()); } } |