Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/quick/qquicktableview/tst_qquicktableview.cpp

Change-Id: If3bf1abc23a59c458be0bb862d92f2edcb16b79f

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp
index 07237c9157..02b5302a45 100644
--- a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp
+++ b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp
@@ -45,6 +45,7 @@ public:
 private slots:
     void properties();
     void propertiesDerived();
+    void revisionedProperties();
     void methods();
     void methodsDerived();
     void signalHandlers();
@@ -84,11 +85,13 @@ class DerivedObject : public BaseObject
     Q_OBJECT
     Q_PROPERTY(int propertyC READ propertyC NOTIFY propertyCChanged)
     Q_PROPERTY(QString propertyD READ propertyD NOTIFY propertyDChanged)
+    Q_PROPERTY(int propertyE READ propertyE NOTIFY propertyEChanged REVISION 1)
 public:
     DerivedObject(QObject *parent = nullptr) : BaseObject(parent) {}
 
     int propertyC() const { return 0; }
     QString propertyD() const { return QString(); }
+    int propertyE() const { return 0; }
 
 public Q_SLOTS:
     void slotB() {}
@@ -96,6 +99,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     void propertyCChanged();
     void propertyDChanged();
+    Q_REVISION(1) void propertyEChanged();
     void signalB();
 };
 
@@ -149,6 +153,23 @@ void tst_qqmlpropertycache::propertiesDerived()
     QCOMPARE(data->coreIndex(), metaObject->indexOfProperty("propertyD"));
 }
 
+void tst_qqmlpropertycache::revisionedProperties()
+{
+    // Check that if you create a QQmlPropertyCache from a QMetaObject together
+    // with an explicit revision, the cache will then, and only then, report a
+    // property with a matching revision as available.
+    DerivedObject object;
+    const QMetaObject *metaObject = object.metaObject();
+
+    QQmlRefPointer<QQmlPropertyCache> cacheWithoutVersion(new QQmlPropertyCache(metaObject));
+    QQmlRefPointer<QQmlPropertyCache> cacheWithVersion(new QQmlPropertyCache(metaObject, 1));
+    QQmlPropertyData *data;
+
+    QVERIFY((data = cacheProperty(cacheWithoutVersion, "propertyE")));
+    QCOMPARE(cacheWithoutVersion->isAllowedInRevision(data), false);
+    QCOMPARE(cacheWithVersion->isAllowedInRevision(data), true);
+}
+
 void tst_qqmlpropertycache::methods()
 {
     QQmlEngine engine;