Commit 6e7b51f9 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Qml2Puppet: Fix compilation with qtdeclarative master



e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 1f74468a
......@@ -109,15 +109,6 @@ static QQmlPropertyCache *cacheForObject(QObject *object, QQmlEngine *engine)
return QQmlEnginePrivate::get(engine)->cache(object);
}
static QAbstractDynamicMetaObject *abstractDynamicMetaObject(QObject *object)
{
QObjectPrivate *op = QObjectPrivate::get(object);
if (op->metaObject)
return static_cast<QAbstractDynamicMetaObject *>(op->metaObject);
return const_cast<QAbstractDynamicMetaObject *>(static_cast<const QAbstractDynamicMetaObject *>(object->metaObject()));
}
NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QQmlEngine *engine)
{
//Avoid setting up multiple NodeInstanceMetaObjects on the same QObject
......@@ -187,8 +178,8 @@ NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstance::Pointer
NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine)
: QQmlVMEMetaObject(object, cacheForObject(object, engine), vMEMetaDataForObject(object)),
m_nodeInstance(nodeInstance),
m_context(engine->contextForObject(object)),
m_prefix(prefix),
m_context(engine->contextForObject(object)),
m_data(new MetaPropertyData),
m_cache(0)
......
......@@ -51,7 +51,7 @@
#include <private/qqmlvaluetype_p.h>
#include <private/qquicktransition_p.h>
#include <private/qquickanimation_p.h>
#include <private/qquicktimer_p.h>
#include <private/qqmltimer_p.h>
#include <private/qqmlengine_p.h>
namespace QmlDesigner {
......@@ -712,7 +712,7 @@ static void stopAnimation(QObject *object)
QQuickTransition *transition = qobject_cast<QQuickTransition*>(object);
QQuickAbstractAnimation *animation = qobject_cast<QQuickAbstractAnimation*>(object);
QQuickTimer *timer = qobject_cast<QQuickTimer*>(object);
QQmlTimer *timer = qobject_cast<QQmlTimer*>(object);
if (transition) {
transition->setFromState("");
transition->setToState("");
......
......@@ -143,7 +143,7 @@ bool QuickItemNodeInstance::childItemsHaveContent(QQuickItem *quickItem)
QPointF QuickItemNodeInstance::position() const
{
return quickItem()->pos();
return quickItem()->position();
}
static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeInstanceServer)
......
Supports Markdown
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