aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/SingletonType.qml18
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/js/jspragma.js43
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType.qml17
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType25.qml17
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType.qml18
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType22.qml18
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/qmldir5
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/qmldir3
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/SType2.qml18
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/qmldir1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/qualified/SingletonType.qml17
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/registeredComposite/CompositeType.qml19
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/remote/RemoteSingletonType2.qml18
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/remote/qmldir1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/subdir/ErrorSingletonType.qml17
-rw-r--r--tests/auto/qml/qqmllanguage/data/singleton/subdir/qmldir3
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest1.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest10.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest11.qml17
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest12.error.txt2
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest12.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest13.error.txt2
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest13.qml8
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest14.error.txt1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest14.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest15.qml8
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest16.qml10
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest2.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest3.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest4.error.txt1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest4.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest5.qml8
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest5a.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest6.qml14
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest6a.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest7.qml14
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest7a.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest8.qml14
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest8a.qml7
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest9.error.txt1
-rw-r--r--tests/auto/qml/qqmllanguage/data/singletonTest9.qml6
42 files changed, 411 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/SingletonType.qml b/tests/auto/qml/qqmllanguage/data/singleton/SingletonType.qml
new file mode 100644
index 0000000000..a2f1a4eeb7
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/SingletonType.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/js/jspragma.js b/tests/auto/qml/qqmllanguage/data/singleton/js/jspragma.js
new file mode 100644
index 0000000000..b652689a48
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/js/jspragma.js
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+.pragma library
+
+var value = 333
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType.qml b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType.qml
new file mode 100644
index 0000000000..9a3b7abbd6
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType25.qml b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType25.qml
new file mode 100644
index 0000000000..ca4d87faf7
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/NonSingletonType25.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+ id: singletonId
+
+ property int testProp1: 225
+ property int testProp2: 125
+ property int testProp3: 55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType.qml b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType.qml
new file mode 100644
index 0000000000..a2f1a4eeb7
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType22.qml b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType22.qml
new file mode 100644
index 0000000000..2ca61b0fcc
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/SingletonType22.qml
@@ -0,0 +1,18 @@
+pragma Singleton
+import QtQuick 2.0
+
+Item {
+ id: singletonId
+
+ property int testProp1: 225
+ property int testProp2: 125
+ property int testProp3: 55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/qmldir b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/qmldir
new file mode 100644
index 0000000000..91fc8f9139
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/module/org/qtproject/SingletonTest/qmldir
@@ -0,0 +1,5 @@
+module org.qtproject.SingletonTest
+singleton SingletonType 1.0 SingletonType.qml
+singleton SingletonType 2.2 SingletonType22.qml
+NonSingletonType 1.0 NonSingletonType.qml
+NonSingletonType 2.5 NonSingletonType25.qml
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/qmldir b/tests/auto/qml/qqmllanguage/data/singleton/qmldir
new file mode 100644
index 0000000000..533fb6999a
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/qmldir
@@ -0,0 +1,3 @@
+singleton SingletonType SingletonType.qml
+
+
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/SType2.qml b/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/SType2.qml
new file mode 100644
index 0000000000..43450afcec
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/SType2.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/qmldir b/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/qmldir
new file mode 100644
index 0000000000..0f499f9dce
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/qmldir-error/qmldir
@@ -0,0 +1 @@
+singleton SType2
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/qualified/SingletonType.qml b/tests/auto/qml/qqmllanguage/data/singleton/qualified/SingletonType.qml
new file mode 100644
index 0000000000..9a3b7abbd6
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/qualified/SingletonType.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/registeredComposite/CompositeType.qml b/tests/auto/qml/qqmllanguage/data/singleton/registeredComposite/CompositeType.qml
new file mode 100644
index 0000000000..5c86c21ffb
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/registeredComposite/CompositeType.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+ id: singletonId
+
+ property int testProp1: 325
+ property int testProp2: 225
+ property int testProp3: 155
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/remote/RemoteSingletonType2.qml b/tests/auto/qml/qqmllanguage/data/singleton/remote/RemoteSingletonType2.qml
new file mode 100644
index 0000000000..41d619a275
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/remote/RemoteSingletonType2.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+ id: singletonId
+
+ property int testProp1: 525
+ property int testProp2: 425
+ property int testProp3: 355
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/remote/qmldir b/tests/auto/qml/qqmllanguage/data/singleton/remote/qmldir
new file mode 100644
index 0000000000..c73782b825
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/remote/qmldir
@@ -0,0 +1 @@
+singleton RemoteSingletonType2 RemoteSingletonType2.qml \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/subdir/ErrorSingletonType.qml b/tests/auto/qml/qqmllanguage/data/singleton/subdir/ErrorSingletonType.qml
new file mode 100644
index 0000000000..9a3b7abbd6
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/subdir/ErrorSingletonType.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+
+Item {
+ id: singletonId
+
+ property int testProp1: 125
+ property int testProp2: 25
+ property int testProp3: -55
+
+ width: 25; height: 25
+
+ Rectangle {
+ id: rectangle
+ border.color: "white"
+ anchors.fill: parent
+ }
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singleton/subdir/qmldir b/tests/auto/qml/qqmllanguage/data/singleton/subdir/qmldir
new file mode 100644
index 0000000000..eb702eccaf
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singleton/subdir/qmldir
@@ -0,0 +1,3 @@
+singleton ErrorSingletonType ErrorSingletonType.qml
+
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest1.qml b/tests/auto/qml/qqmllanguage/data/singletonTest1.qml
new file mode 100644
index 0000000000..2eb80df53c
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest1.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ property int value1: SingletonType.testProp1;
+ property string value2: "Test value: " + SingletonType.testProp3;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt
new file mode 100644
index 0000000000..32d2ed857e
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest10.error.txt
@@ -0,0 +1 @@
+4:1:Composite Singleton Type SingletonType is not creatable.
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest10.qml b/tests/auto/qml/qqmllanguage/data/singletonTest10.qml
new file mode 100644
index 0000000000..292536c628
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest10.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ property SingletonType test
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest11.qml b/tests/auto/qml/qqmllanguage/data/singletonTest11.qml
new file mode 100644
index 0000000000..4248731314
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest11.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ id: test
+
+ property int value1: SingletonType.testProp1;
+ property string value2: "Test value: " + SingletonType.testProp3;
+
+ signal customSignal(SingletonType type)
+
+ onCustomSignal: {
+ type.testProp1 = 99
+ }
+
+ Component.onCompleted: test.customSignal(SingletonType)
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest12.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest12.error.txt
new file mode 100644
index 0000000000..716cf5709a
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest12.error.txt
@@ -0,0 +1,2 @@
+5:5:Type RegisteredCompositeType unavailable
+2:1:pragma Singleton used with a non composite singleton type CompositeSingletonTest/RegisteredCompositeType
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest12.qml b/tests/auto/qml/qqmllanguage/data/singletonTest12.qml
new file mode 100644
index 0000000000..06015c33d2
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest12.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import CompositeSingletonTest 1.0
+
+Item {
+ RegisteredCompositeType { }
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest13.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest13.error.txt
new file mode 100644
index 0000000000..bc9cc61d57
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest13.error.txt
@@ -0,0 +1,2 @@
+-1:-1:Type ErrorSingletonType unavailable
+-1:-1:qmldir defines type as singleton, but no pragma Singleton found in type ErrorSingletonType.
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest13.qml b/tests/auto/qml/qqmllanguage/data/singletonTest13.qml
new file mode 100644
index 0000000000..04c0471ad6
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest13.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import "singleton/subdir"
+
+Item {
+ property int value1: ErrorSingletonType.testProp1;
+ property string value2: "Test value: " + ErrorSingletonType.testProp3;
+ property variant singletonInstance: ErrorSingletonType;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest14.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest14.error.txt
new file mode 100644
index 0000000000..c2463d2899
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest14.error.txt
@@ -0,0 +1 @@
+2:1:singleton types require 2 or 3 arguments, but 1 were provided
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest14.qml b/tests/auto/qml/qqmllanguage/data/singletonTest14.qml
new file mode 100644
index 0000000000..7fad45be5d
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest14.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import "singleton/qmldir-error"
+
+Item {
+ property int value1: SType2.testProp1;
+ property string value2: "Test value: " + SType2.testProp3;
+} \ No newline at end of file
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest15.qml b/tests/auto/qml/qqmllanguage/data/singletonTest15.qml
new file mode 100644
index 0000000000..183d52d259
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest15.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import "http://127.0.0.1:14447/singleton/remote"
+
+Item {
+ property int value1: RemoteSingletonType2.testProp1;
+ property string value2: "Test value: " + RemoteSingletonType2.testProp3;
+ property variant singletonInstance: RemoteSingletonType2;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest16.qml b/tests/auto/qml/qqmllanguage/data/singletonTest16.qml
new file mode 100644
index 0000000000..ea8b3a2eba
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest16.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import "singleton"
+import "singleton/js/jspragma.js" as JsPragmaTest
+
+Item {
+ id: test
+
+ property int value1: SingletonType.testProp1;
+ property string value2: "Test value: " + JsPragmaTest.value;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest2.qml b/tests/auto/qml/qqmllanguage/data/singletonTest2.qml
new file mode 100644
index 0000000000..b22d8e6c9a
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest2.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ property variant singleton1: SingletonType;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest3.qml b/tests/auto/qml/qqmllanguage/data/singletonTest3.qml
new file mode 100644
index 0000000000..f984a12c89
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest3.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ property QtObject singleton2: SingletonType;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest4.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest4.error.txt
new file mode 100644
index 0000000000..77c26df310
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest4.error.txt
@@ -0,0 +1 @@
+2:1:No matching type found, pragma Singleton files cannot be used by QQmlComponent.
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest4.qml b/tests/auto/qml/qqmllanguage/data/singletonTest4.qml
new file mode 100644
index 0000000000..c0aca77e0f
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest4.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+pragma Singleton
+
+Item {
+
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest5.qml b/tests/auto/qml/qqmllanguage/data/singletonTest5.qml
new file mode 100644
index 0000000000..b673f24023
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest5.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import "singleton" as TestNameSpace
+
+Item {
+ property int value1: TestNameSpace.SingletonType.testProp1;
+ property string value2: "Test value: " + TestNameSpace.SingletonType.testProp3;
+ property variant singletonInstance: TestNameSpace.SingletonType;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest5a.qml b/tests/auto/qml/qqmllanguage/data/singletonTest5a.qml
new file mode 100644
index 0000000000..634bdeb8e3
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest5a.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ property variant singletonInstance: SingletonType;
+}
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest6.qml b/tests/auto/qml/qqmllanguage/data/singletonTest6.qml
new file mode 100644
index 0000000000..0c5c65cc7a
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest6.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 1.0
+
+Item {
+ property int value1: SingletonType.testProp1;
+ property string value2: "Test value: " + SingletonType.testProp3;
+ property variant singletonInstance: SingletonType;
+
+ NonSingletonType { id: nonSingleton }
+
+ property int value3: nonSingleton.testProp1;
+ property string value4: "Test value: " + nonSingleton.testProp3;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest6a.qml b/tests/auto/qml/qqmllanguage/data/singletonTest6a.qml
new file mode 100644
index 0000000000..cf57bcc594
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest6a.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 1.0
+
+Item {
+ property variant singletonInstance: SingletonType;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest7.qml b/tests/auto/qml/qqmllanguage/data/singletonTest7.qml
new file mode 100644
index 0000000000..f1d8418ac8
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest7.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 2.5
+
+Item {
+ property int value1: SingletonType.testProp1;
+ property string value2: "Test value: " + SingletonType.testProp3;
+ property variant singletonInstance: SingletonType;
+
+ NonSingletonType { id: nonSingleton }
+
+ property int value3: nonSingleton.testProp1;
+ property string value4: "Test value: " + nonSingleton.testProp3;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest7a.qml b/tests/auto/qml/qqmllanguage/data/singletonTest7a.qml
new file mode 100644
index 0000000000..8f8a7ff249
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest7a.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 2.5
+
+Item {
+ property variant singletonInstance: SingletonType;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest8.qml b/tests/auto/qml/qqmllanguage/data/singletonTest8.qml
new file mode 100644
index 0000000000..d55c16045b
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest8.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 2.5 as TestNameSpace
+
+Item {
+ property int value1: TestNameSpace.SingletonType.testProp1;
+ property string value2: "Test value: " + TestNameSpace.SingletonType.testProp3;
+ property variant singletonInstance: TestNameSpace.SingletonType;
+
+ TestNameSpace.NonSingletonType { id: nonSingleton }
+
+ property int value3: nonSingleton.testProp1;
+ property string value4: "Test value: " + nonSingleton.testProp3;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest8a.qml b/tests/auto/qml/qqmllanguage/data/singletonTest8a.qml
new file mode 100644
index 0000000000..8f8a7ff249
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest8a.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import org.qtproject.SingletonTest 2.5
+
+Item {
+ property variant singletonInstance: SingletonType;
+}
+
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest9.error.txt b/tests/auto/qml/qqmllanguage/data/singletonTest9.error.txt
new file mode 100644
index 0000000000..7481e47ae2
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest9.error.txt
@@ -0,0 +1 @@
+5:5:Composite Singleton Type SingletonType is not creatable.
diff --git a/tests/auto/qml/qqmllanguage/data/singletonTest9.qml b/tests/auto/qml/qqmllanguage/data/singletonTest9.qml
new file mode 100644
index 0000000000..142e798809
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/singletonTest9.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+import "singleton"
+
+Item {
+ SingletonType {}
+}