diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-15 09:58:44 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-04-17 12:27:35 +0200 |
| commit | ba22fb2116ecf2076d207d5e4f0c5897bd4a1ab5 (patch) | |
| tree | 5807e9e2bf173a2353c8ab807908ae941ba90da5 /src/quick | |
| parent | 9e0fe0d9ec5edc47422eca94aa95ad804ca69a7a (diff) | |
Declare some missing value types
* An opaque pointer for the execution engine
* QQmlChangeSet
* long and ulong: For those we cannot know the size in advance.
Therefore we cannot handle them as aliases of other numbers.
* QTextBlock
* FileProperty
* QQmlXmlListModuleQueryResult
Task-number: QTBUG-101143
Change-Id: If66d1fa3ab734351006e5a9f071e171c97dd738e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.h | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 8 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 01f15d2490..4c26708168 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -10018,7 +10018,7 @@ void QV4::Heap::QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::MarkS QObjectWrapper::markObjects(that, markStack); } -quint64 QQuickItemPrivate::_q_createJSWrapper(QV4::ExecutionEngine *engine) +quint64 QQuickItemPrivate::_q_createJSWrapper(QQmlV4ExecutionEnginePtr engine) { return (engine->memoryManager->allocate<QQuickItemWrapper>(q_func()))->asReturnedValue(); } diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index fdf09d30b0..6b54b1af24 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -121,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) @@ -470,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; diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 78291787fe..c2e014b72d 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -295,7 +295,7 @@ public: static void transform_clear(QQmlListProperty<QQuickTransform> *list); void _q_resourceObjectDeleted(QObject *); - quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine); + quint64 _q_createJSWrapper(QQmlV4ExecutionEnginePtr engine); enum ChangeType { Geometry = 0x01, diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 3dc6eae24b..ef09457327 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -28,6 +28,14 @@ class QQuickTextEditPrivate; class QQuickTextSelection; class QTextBlock; +class QQuickTextBlockForeign +{ + Q_GADGET + QML_ANONYMOUS + QML_FOREIGN(QTextBlock) + QML_EXTENDED(QQuickTextBlockForeign) +}; + class Q_QUICK_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem, public QQuickTextInterface { Q_OBJECT |