[Development] Qt 5.2 header diff: QtQml

Knoll Lars Lars.Knoll at digia.com
Tue Nov 5 19:10:48 CET 2013


Module looks ok. Some comment inline:

On 05/11/13 01:07, "Thiago Macieira" <thiago.macieira at intel.com> wrote:

>Pastebin URL (expires in 24 hours):
>http://paste.fedoraproject.org/51637/13836114
>
>template<typename T>
> QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create =
>true)
> {
>diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
>index aefad47..fe376d0 100644
>--- a/src/qml/qml/qqmlcomponent.h
>+++ b/src/qml/qml/qqmlcomponent.h
>@@ -56,7 +56,7 @@ class QByteArray;
> class QQmlEngine;
> class QQmlComponent;
> class QQmlIncubator;
>-class QQmlV8Function;
>+class QQmlV4Function;
> class QQmlCompiledData;
> class QQmlComponentPrivate;
> class QQmlComponentAttached;
>@@ -120,8 +120,8 @@ Q_SIGNALS:
> 
> protected:
>     QQmlComponent(QQmlComponentPrivate &dd, QObject* parent);
>-    Q_INVOKABLE void createObject(QQmlV8Function *);
>-    Q_INVOKABLE void incubateObject(QQmlV8Function *);
>+    Q_INVOKABLE void createObject(QQmlV4Function *);
>+    Q_INVOKABLE void incubateObject(QQmlV4Function *);

The QQmlV8/4Function is only used internally to be able to invoke methods
from JavaScript. the name change is a result of moving from v8 to v4, but
doesn┬╣t affect compatibility.

>diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h
>index b04abc1..b702a37 100644
>--- a/src/qml/qml/qqmlexpression.h
>+++ b/src/qml/qml/qqmlexpression.h
>@@ -91,14 +91,6 @@ public:
> Q_SIGNALS:
>     void valueChanged();
> 
>-protected:
>-    QQmlExpression(QQmlContextData *, QObject *, const QString &,
>-                           QQmlExpressionPrivate &dd);
>-    QQmlExpression(QQmlContextData *, QObject *, const QString &, bool,
>-                           const QString &, int, int,
>QQmlExpressionPrivate &dd);
>-    QQmlExpression(QQmlContextData *, QObject *, const QByteArray &,
>bool,
>-                           const QString &, int, int,
>QQmlExpressionPrivate &dd);

These methods were marked \internal.






More information about the Development mailing list