feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qml2Puppet: Fix compilation with qtdeclarative master

Browse Source 
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: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-08 21:26:29 +02:00
committed by Orgad Shaneh
parent 1f74468a56
commit 6e7b51f941
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp
View File

@@ -109,15 +109,6 @@ static QQmlPropertyCache *cacheForObject(QObject *object, QQmlEngine *engine)
return QQmlEnginePrivate::get(engine)->cache(object); 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) NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QQmlEngine *engine)
{ {
//Avoid setting up multiple NodeInstanceMetaObjects on the same QObject //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) NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine)
: QQmlVMEMetaObject(object, cacheForObject(object, engine), vMEMetaDataForObject(object)), : QQmlVMEMetaObject(object, cacheForObject(object, engine), vMEMetaDataForObject(object)),
m_nodeInstance(nodeInstance), m_nodeInstance(nodeInstance),
m_context(engine->contextForObject(object)),
m_prefix(prefix), m_prefix(prefix),
m_context(engine->contextForObject(object)),
m_data(new MetaPropertyData), m_data(new MetaPropertyData),
m_cache(0) m_cache(0)

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -51,7 +51,7 @@
#include <private/qqmlvaluetype_p.h> #include <private/qqmlvaluetype_p.h>
#include <private/qquicktransition_p.h> #include <private/qquicktransition_p.h>
#include <private/qquickanimation_p.h> #include <private/qquickanimation_p.h>
#include <private/qquicktimer_p.h> #include <private/qqmltimer_p.h>
#include <private/qqmlengine_p.h> #include <private/qqmlengine_p.h>
namespace QmlDesigner { namespace QmlDesigner {
@@ -712,7 +712,7 @@ static void stopAnimation(QObject *object)
QQuickTransition *transition = qobject_cast<QQuickTransition*>(object); QQuickTransition *transition = qobject_cast<QQuickTransition*>(object);
QQuickAbstractAnimation *animation = qobject_cast<QQuickAbstractAnimation*>(object); QQuickAbstractAnimation *animation = qobject_cast<QQuickAbstractAnimation*>(object);
QQuickTimer *timer = qobject_cast<QQuickTimer*>(object); QQmlTimer *timer = qobject_cast<QQmlTimer*>(object);
if (transition) { if (transition) {
transition->setFromState(""); transition->setFromState("");
transition->setToState(""); transition->setToState("");

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -143,7 +143,7 @@ bool QuickItemNodeInstance::childItemsHaveContent(QQuickItem *quickItem)
QPointF QuickItemNodeInstance::position() const QPointF QuickItemNodeInstance::position() const
{ {
return quickItem()->pos(); return quickItem()->position();
} }
static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeInstanceServer) static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeInstanceServer)