4 files changed, 50 insertions, 0 deletions
diff --git a/tests/auto/qml/qmllint/data/StaticTest/multi.qmltypes b/tests/auto/qml/qmllint/data/StaticTest/multi.qmltypes
new file mode 100644
index 0000000000..9a2ed24482
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/StaticTest/multi.qmltypes
@@ -0,0 +1,41 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by qmltyperegistrar.
+
+Module {
+    Component {
+        file: "testtypes.h"
+        name: "ExtensionA"
+        accessSemantics: "reference"
+        prototype: "QObject"
+        Property { name: "a"; type: "int"; isReadonly: true; read: "a" }
+    }
+    Component {
+        file: "testtypes.h"
+        name: "ExtensionB"
+        accessSemantics: "reference"
+        prototype: "QObject"
+        Property { name: "b"; type: "int"; isReadonly: true; read: "b" }
+    }
+    Component {
+        file: "testtypes.h"
+        name: "MultiExtension"
+        accessSemantics: "reference"
+        prototype: "MultiExtensionParent"
+        exports: ["StaticTest/MultiExtension 1.0"]
+        exportMetaObjectRevisions: [256]
+        extension: "ExtensionB"
+        Property { name: "e"; type: "int"; isReadonly: true; read: "e" }
+    }
+    Component {
+        file: "testtypes.h"
+        name: "MultiExtensionParent"
+        accessSemantics: "reference"
+        prototype: "QObject"
+        extension: "ExtensionA"
+        Property { name: "p"; type: "int"; isReadonly: true; read: "p" }
+    }
+}
diff --git a/tests/auto/qml/qmllint/data/StaticTest/qmldir b/tests/auto/qml/qmllint/data/StaticTest/qmldir
new file mode 100644
index 0000000000..4702175b79
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/StaticTest/qmldir
@@ -0,0 +1,2 @@
+module StaticTest
+typeinfo multi.qmltypes
diff --git a/tests/auto/qml/qmllint/data/multiExtension.qml b/tests/auto/qml/qmllint/data/multiExtension.qml
new file mode 100644
index 0000000000..12b36dbb4f
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/multiExtension.qml
@@ -0,0 +1,6 @@
+import StaticTest
+
+MultiExtension {
+    property int t: a + b + e + p
+}
+
diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp
index 895953c2f7..b874d3cc6f 100644
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -337,6 +337,7 @@ void TestQmllint::cleanQmlCode_data()
     QTest::newRow("goodAliasObject") << QStringLiteral("goodAliasObject.qml");
     QTest::newRow("jsmoduleimport") << QStringLiteral("jsmoduleimport.qml");
     QTest::newRow("overridescript") << QStringLiteral("overridescript.qml");
+    QTest::newRow("multiExtension") << QStringLiteral("multiExtension.qml");
 }
 
 void TestQmllint::cleanQmlCode()