diff options
Diffstat (limited to 'src/quick/items/qquickitem.h')
| -rw-r--r-- | src/quick/items/qquickitem.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 6a1f8db8c8..6b54b1af24 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -45,7 +45,6 @@ private: class QCursor; class QQuickItemLayer; -class QQmlV4Function; class QQuickState; class QQuickAnchorLine; class QQuickTransition; @@ -102,6 +101,8 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL) Q_PROPERTY(bool activeFocusOnTab READ activeFocusOnTab WRITE setActiveFocusOnTab NOTIFY activeFocusOnTabChanged FINAL REVISION(2, 1)) + Q_PROPERTY(Qt::FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy NOTIFY focusPolicyChanged REVISION(6, 7)) + Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged) @@ -120,7 +121,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_CLASSINFO("DefaultProperty", "data") Q_CLASSINFO("ParentProperty", "parent") - Q_CLASSINFO("qt_QmlJSWrapperFactoryMethod", "_q_createJSWrapper(QV4::ExecutionEngine*)") + Q_CLASSINFO("qt_QmlJSWrapperFactoryMethod", "_q_createJSWrapper(QQmlV4ExecutionEnginePtr)") QML_NAMED_ELEMENT(Item) QML_ADDED_IN_VERSION(2, 0) @@ -270,6 +271,9 @@ public: bool isFocusScope() const; QQuickItem *scopedFocusItem() const; + Qt::FocusPolicy focusPolicy() const; + void setFocusPolicy(Qt::FocusPolicy policy); + bool isAncestorOf(const QQuickItem *child) const; Qt::MouseButtons acceptedMouseButtons() const; @@ -318,7 +322,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectFromItem") - void mapFromItem(QQmlV4Function*) const; + void mapFromItem(QQmlV4FunctionPtr) const; #endif Q_INVOKABLE QPointF mapFromItem(const QQuickItem *item, const QPointF &point) const; // overloads mainly exist for QML @@ -328,7 +332,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectToItem") - void mapToItem(QQmlV4Function*) const; + void mapToItem(QQmlV4FunctionPtr) const; #endif Q_INVOKABLE QPointF mapToItem(const QQuickItem *item, const QPointF &point) const; // overloads mainly exist for QML @@ -338,7 +342,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") - Q_REVISION(2, 7) void mapFromGlobal(QQmlV4Function*) const; + Q_REVISION(2, 7) void mapFromGlobal(QQmlV4FunctionPtr) const; #endif Q_REVISION(2, 7) Q_INVOKABLE QPointF mapFromGlobal(qreal x, qreal y) const; // overload mainly exists for QML @@ -346,7 +350,7 @@ public: #if QT_DEPRECATED_SINCE(6, 5) QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") - Q_REVISION(2, 7) void mapToGlobal(QQmlV4Function*) const; + Q_REVISION(2, 7) void mapToGlobal(QQmlV4FunctionPtr) const; #endif Q_REVISION(2, 7) Q_INVOKABLE QPointF mapToGlobal(qreal x, qreal y) const; // overload only exist for QML @@ -383,6 +387,7 @@ Q_SIGNALS: void stateChanged(const QString &); void focusChanged(bool); void activeFocusChanged(bool); + Q_REVISION(6, 7) void focusPolicyChanged(Qt::FocusPolicy); Q_REVISION(2, 1) void activeFocusOnTabChanged(bool); void parentChanged(QQuickItem *); void transformOriginChanged(TransformOrigin); @@ -465,7 +470,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *)) - Q_PRIVATE_SLOT(d_func(), quint64 _q_createJSWrapper(QV4::ExecutionEngine *)) + Q_PRIVATE_SLOT(d_func(), quint64 _q_createJSWrapper(QQmlV4ExecutionEnginePtr)) friend class QQuickWindowPrivate; friend class QQuickDeliveryAgentPrivate; @@ -473,6 +478,10 @@ private: friend class QAccessibleQuickItem; friend class QQuickAccessibleAttached; friend class QQuickAnchorChanges; +#ifndef QT_NO_DEBUG_STREAM + friend Q_QUICK_EXPORT QDebug operator<<(QDebug debug, QQuickItem *item); +#endif + Q_DISABLE_COPY(QQuickItem) Q_DECLARE_PRIVATE(QQuickItem) }; @@ -504,7 +513,4 @@ QDebug Q_QUICK_EXPORT operator<<(QDebug debug, QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickItem) -QML_DECLARE_TYPE(QQuickTransform) - #endif // QQUICKITEM_H |