diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-25 13:32:55 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-27 09:34:20 +0100 |
commit | 8dd18850714b9a8e7a51891a2c48f8ca94ffe014 (patch) | |
tree | 261d3a1b4c48e9858a6dd3b86404f1758f53fcda | |
parent | 63aee8b66712601b6c34e4f2df99614f2d092c9d (diff) |
Revision properties and methods added in 5.15
Change-Id: I00e3f9535e819d9d0d547c9d3cf50be469cf9339
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | src/qmlmodels/qqmlobjectmodel_p.h | 4 | ||||
-rw-r--r-- | src/qmlworkerscript/qquickworkerscript_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickanimatedsprite_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemview_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktext_p.h | 4 | ||||
-rw-r--r-- | tests/auto/qml/qquickworkerscript/data/BaseWorker.qml | 1 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/qmlmodels/qqmlobjectmodel_p.h b/src/qmlmodels/qqmlobjectmodel_p.h index 7fb4f64676..866d010cd3 100644 --- a/src/qmlmodels/qqmlobjectmodel_p.h +++ b/src/qmlmodels/qqmlobjectmodel_p.h @@ -104,8 +104,8 @@ Q_SIGNALS: void createdItem(int index, QObject *object); void initItem(int index, QObject *object); void destroyingItem(QObject *object); - void itemPooled(int index, QObject *object); - void itemReused(int index, QObject *object); + Q_REVISION(15) void itemPooled(int index, QObject *object); + Q_REVISION(15) void itemReused(int index, QObject *object); protected: QQmlInstanceModel(QObjectPrivate &dd, QObject *parent = nullptr) diff --git a/src/qmlworkerscript/qquickworkerscript_p.h b/src/qmlworkerscript/qquickworkerscript_p.h index 22a205cfe4..e56ce84b6d 100644 --- a/src/qmlworkerscript/qquickworkerscript_p.h +++ b/src/qmlworkerscript/qquickworkerscript_p.h @@ -88,7 +88,7 @@ class Q_AUTOTEST_EXPORT QQuickWorkerScript : public QObject, public QQmlParserSt { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) - Q_PROPERTY(bool ready READ ready NOTIFY readyChanged) + Q_PROPERTY(bool ready READ ready NOTIFY readyChanged REVISION 15) QML_NAMED_ELEMENT(WorkerScript); @@ -107,7 +107,7 @@ public Q_SLOTS: Q_SIGNALS: void sourceChanged(); - void readyChanged(); + Q_REVISION(15) void readyChanged(); void message(const QJSValue &messageObject); protected: diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index c28b6ce3af..546598a409 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -124,6 +124,7 @@ public: bool paused() const; int currentFrame() const; FinishBehavior finishBehavior() const; + void setFinishBehavior(FinishBehavior arg); Q_SIGNALS: @@ -172,7 +173,6 @@ public Q_SLOTS: void resetFrameDuration(); void setLoops(int arg); void setCurrentFrame(int arg); - void setFinishBehavior(FinishBehavior arg); private Q_SLOTS: void createEngine(); diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index 521580d292..3f83383cd5 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -303,8 +303,8 @@ protected Q_SLOTS: virtual void initItem(int index, QObject *item); void modelUpdated(const QQmlChangeSet &changeSet, bool reset); void destroyingItem(QObject *item); - void onItemPooled(int modelIndex, QObject *object); - void onItemReused(int modelIndex, QObject *object); + Q_REVISION(15) void onItemPooled(int modelIndex, QObject *object); + Q_REVISION(15) void onItemReused(int modelIndex, QObject *object); void animStopped(); void trackedPositionChanged(); diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index d310db508e..b64751b6f4 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -330,8 +330,8 @@ class QQuickTextLine : public QObject Q_PROPERTY(qreal height READ height WRITE setHeight) Q_PROPERTY(qreal x READ x WRITE setX) Q_PROPERTY(qreal y READ y WRITE setY) - Q_PROPERTY(qreal implicitWidth READ implicitWidth) - Q_PROPERTY(bool isLast READ isLast) + Q_PROPERTY(qreal implicitWidth READ implicitWidth REVISION 15) + Q_PROPERTY(bool isLast READ isLast REVISION 15) QML_ANONYMOUS public: diff --git a/tests/auto/qml/qquickworkerscript/data/BaseWorker.qml b/tests/auto/qml/qquickworkerscript/data/BaseWorker.qml index 59af114379..1d3420e186 100644 --- a/tests/auto/qml/qquickworkerscript/data/BaseWorker.qml +++ b/tests/auto/qml/qquickworkerscript/data/BaseWorker.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQml.WorkerScript 2.15 WorkerScript { id: worker |