Merge remote-tracking branch 'origin/4.0'

Conflicts: src/libs/utils/tcpportsgatherer.h Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
2016-04-05 14:11:47 +02:00
parent c8c6c8ec50 1ec4bbb029
commit 1ae483fc83
45 changed files with 165 additions and 590 deletions
@@ -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());
        }
   }