From c3a4ce70e588620393a9a4189f3e429622103406 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 5 Jan 2011 17:52:36 +1000
Subject: Test importing version > registered with a matching base class rev.

Consieder the case of a BaseClass registered with version 1.1 and the
created Class registered with version 1.0. When version 1.1 is imported
the Class should be able to use BaseClass properties from version 1.1.
This currently fails.

Task-number: QTBUG-13451
---
 .../qdeclarativelanguage/data/versionedbase.qml    |  8 +++++++
 .../declarative/qdeclarativelanguage/testtypes.cpp |  3 +++
 .../declarative/qdeclarativelanguage/testtypes.h   | 26 ++++++++++++++++++++++
 .../tst_qdeclarativelanguage.cpp                   | 17 +++++++++++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
new file mode 100644
index 0000000..8c74715
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+import Test 1.1
+
+MySubclass
+{
+    prop1: 10
+    prop2: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
index 217f54a..18e3885 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
@@ -62,6 +62,9 @@ void registerTypes()
     // MyRevisionedSubclass 1.1 uses MyRevisionedClass revision 1
     qmlRegisterType<MyRevisionedSubclass,1>("Test",1,1,"MyRevisionedSubclass");
 
+    // Only version 1.0, but its super class is registered in version 1.1 also
+    qmlRegisterType<MySubclass>("Test",1,0,"MySubclass");
+
     qmlRegisterCustomType<MyCustomParserType>("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser);
 
     qmlRegisterTypeNotAvailable("Test",1,0,"UnavailableType", "UnavailableType is unavailable for testing");
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 4508d01..48055e8 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -757,10 +757,36 @@ protected:
     qreal m_p4;
 };
 
+class MySubclass : public MyRevisionedClass
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop5 READ prop5 WRITE setProp5 NOTIFY prop5Changed)
+
+public:
+    MySubclass() : m_p5(5) {}
+
+    qreal prop5() const { return m_p5; }
+    void setProp5(qreal p) {
+        if (p != m_p5) {
+            m_p5 = p;
+            emit prop5Changed();
+        }
+    }
+
+    Q_INVOKABLE void method5() { }
+
+signals:
+    void prop5Changed();
+
+protected:
+    qreal m_p5;
+};
+
 QML_DECLARE_TYPE(MyRevisionedBaseClassRegistered)
 QML_DECLARE_TYPE(MyRevisionedBaseClassUnregistered)
 QML_DECLARE_TYPE(MyRevisionedClass)
 QML_DECLARE_TYPE(MyRevisionedSubclass)
+QML_DECLARE_TYPE(MySubclass)
 
 
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 298d802..a139d5e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1935,7 +1935,8 @@ void tst_qdeclarativelanguage::revisions()
         delete object;
     }
     {
-        QDeclarativeComponent component(&engine, TEST_FILE("revisionssub11.qml"));
+        QDeclarativeEngine myEngine;
+        QDeclarativeComponent component(&myEngine, TEST_FILE("revisionssub11.qml"));
 
         VERIFY_ERRORS(0);
         MyRevisionedSubclass *object = qobject_cast<MyRevisionedSubclass*>(component.create());
@@ -1948,6 +1949,20 @@ void tst_qdeclarativelanguage::revisions()
 
         delete object;
     }
+    {
+        // If this is uncommented it will work
+        // qmlRegisterType<MySubclass,0>("Test",1,1,"MySubclass");
+        QDeclarativeComponent component(&engine, TEST_FILE("versionedbase.qml"));
+        QEXPECT_FAIL("", "Class version 1.0 with base class version 1.1 registered", Abort);
+        VERIFY_ERRORS(0);
+        MySubclass *object = qobject_cast<MySubclass*>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->prop1(), 10.0);
+        QCOMPARE(object->prop2(), 10.0);
+
+        delete object;
+    }
 }
 
 void tst_qdeclarativelanguage::initTestCase()
-- 
cgit v0.12