Commit a299252a authored by Marco Bubke's avatar Marco Bubke

QmlDesigner.NodeInstances: Remove Qt 5 defines

Change-Id: Ie835af0e32800887d6cc2f6eebcd9dd79b3100a5
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent fe97c7f4
......@@ -47,10 +47,7 @@
#include <QHash>
#include <QSet>
#include <QDebug>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#include <QQuickItem>
#endif
#include <private/qqmlengine_p.h>
#include <QQmlEngine>
......@@ -222,11 +219,7 @@ ServerNodeInstance ServerNodeInstance::create(NodeInstanceServer *nodeInstanceSe
}
if ((object == 0) && (instanceContainer.metaType() == InstanceContainer::ItemMetaType)) //If we cannot instanciate the object but we know it has to be an Ttem, we create an Item instead.
#if QT_VERSION >= 0x050000
object = Internal::ObjectNodeInstance::createPrimitive("QQuickItem", 2, 0, nodeInstanceServer->context());
#else
object = Internal::ObjectNodeInstance::createPrimitive("QtQuick/Item", 1, 0, nodeInstanceServer->context());
#endif
object = Internal::ObjectNodeInstance::createPrimitive("QtQuick/Item", 2, 0, nodeInstanceServer->context());
QQmlEnginePrivate::get(nodeInstanceServer->engine())->cache(object->metaObject());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment