-
Eike Ziller authored
Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h tests/auto/treeviewfind/treeviewfind.pro Change-Id: I1ec788373656c947b50d72df6c26c91312469692
38b61177