Merge branch 'master' into animation-refactorwip/animation-refactor

Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml
new file mode 100644
index 0000000000..4ddedc31a8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importJs.8.qml
@@ -0,0 +1,15 @@
+import com.nokia.PureJsModule 1.5 as PJM
+import QtQuick 2.0
+
+Item {
+    property bool test: false
+
+    Component.onCompleted: {
+        test = ((PJM.FirstAPI.greeting() == "Hello") &&
+                (PJM.FirstAPI.major == 1) &&
+                (PJM.FirstAPI.minor == 0) &&
+                (PJM.SecondAPI.greeting() == "Howdy") &&
+                (PJM.SecondAPI.major == 1) &&
+                (PJM.SecondAPI.minor == 5))
+    }
+}