diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/declarative/qdeclarativeqt/data | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/data')
28 files changed, 0 insertions, 327 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/data/atob.qml b/tests/auto/declarative/qdeclarativeqt/data/atob.qml deleted file mode 100644 index 0d684003a1..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/atob.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string test1: Qt.atob() - property string test2: Qt.atob("SGVsbG8gd29ybGQh") -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/btoa.qml b/tests/auto/declarative/qdeclarativeqt/data/btoa.qml deleted file mode 100644 index 0ecd01d284..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/btoa.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string test1: Qt.btoa() - property string test2: Qt.btoa("Hello world!") -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml deleted file mode 100644 index 3ebc9f14f8..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property bool emptyArg: false - - property string relativeUrl - property string absoluteUrl - - property QtObject incorectArgCount1: Qt.createComponent() - property QtObject incorectArgCount2: Qt.createComponent("main.qml", 10) - - Component.onCompleted: { - emptyArg = (Qt.createComponent("") == null); - var r = Qt.createComponent("createComponentData.qml"); - relativeUrl = r.url; - - var a = Qt.createComponent("http://www.example.com/test.qml"); - absoluteUrl = a.url; - } -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml deleted file mode 100644 index 2a824e5362..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int test: 1913 -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js deleted file mode 100644 index 30499e943e..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.js +++ /dev/null @@ -1,11 +0,0 @@ -.pragma library - -function loadComponent() { - var component = Qt.createComponent("createComponentData.qml"); - return component.status; -} - -function createComponent() { - var component = Qt.createComponent("createComponentData.qml"); - return component.createObject(null); -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml deleted file mode 100644 index a52453e8fa..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import "createComponent_lib.js" as Test - -Item { - property int status: Component.Null - property int readValue: 0 - - Component.onCompleted: { - status = Test.loadComponent() - readValue = Test.createComponent().test; - } -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml deleted file mode 100644 index 87601b1cc8..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml +++ /dev/null @@ -1,31 +0,0 @@ -import QtQuick 2.0 - -Item { - id: root - - // errors resulting in exceptions - property QtObject incorrectArgCount1: Qt.createQmlObject() - property QtObject incorrectArgCount2: Qt.createQmlObject("import QtQuick 2.0\nQtObject{}", root, "main.qml", 10) - property QtObject noParent: Qt.createQmlObject("import QtQuick 2.0\nQtObject{\nproperty int test: 13}", 0) - property QtObject notAvailable: Qt.createQmlObject("import QtQuick 2.0\nQtObject{Blah{}}", root) - property QtObject errors: Qt.createQmlObject("import QtQuick 2.0\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") - - property bool emptyArg: false - - property bool success: false - - Component.onCompleted: { - // errors resulting in nulls - emptyArg = (Qt.createQmlObject("", root) == null); - try { - Qt.createQmlObject("import QtQuick 2.0\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root) - } catch (error) { - console.log("RunTimeError: ",error.message); - } - - var o = Qt.createQmlObject("import QtQuick 2.0\nQtObject{\nproperty int test: 13\n}", root); - success = (o.test == 13); - - Qt.createQmlObject("import QtQuick 2.0\nItem {}\n", root); - } -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml deleted file mode 100644 index ce6c705fb4..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/darker.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.darker(Qt.rgba(1, 0.8, 0.3)) - property variant test2: Qt.darker() - property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8) - property variant test4: Qt.darker("red"); - property variant test5: Qt.darker("perfectred"); // Non-existant color - property variant test6: Qt.darker(10); - property variant test7: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8, 10) -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml b/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml deleted file mode 100644 index 641ba6e1ca..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/dateTimeConversion.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -QtObject { - // months are 0-based - so January = 0, December = 11. - property variant qtime: new Date(2000,0,0,14,15,38,200) // yyyy/MM/dd 14:15:38.200 - property variant qdate: new Date(2008,11,24) // 2008/12/24 hh:mm:ss.zzz - property variant qdatetime: new Date(2008,11,24,14,15,38,200) // 2008/12/24 14:15:38.200 - - property variant qdatetime2: new Date(2852,11,31,23,59,59,500) // 2852/12/31 23:59:59.500 - property variant qdatetime3: new Date(2000,0,1,0,0,0,0) // 2000/01/01 00:00:00.000 - property variant qdatetime4: new Date(2001,1,2) // 2001/02/02 hh:mm:ss.zzz - property variant qdatetime5: new Date(1999,0,1,2,3,4) // 1999/01/01 02:03:04.zzz - property variant qdatetime6: new Date(2008,1,24,14,15,38,200) // 2008/02/24 14:15:38.200 -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/enums.qml b/tests/auto/declarative/qdeclarativeqt/data/enums.qml deleted file mode 100644 index 5a2ff534af..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/enums.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property int test1: Qt.Key_Escape - property int test2: Qt.DescendingOrder - property int test3: Qt.ElideMiddle - property int test4: Qt.AlignRight -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml b/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml deleted file mode 100644 index 70245ab159..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.fontFamilies(10) - property variant test2: Qt.fontFamilies(); -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml deleted file mode 100644 index 7a462c8eeb..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml +++ /dev/null @@ -1,44 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property date dateFromString: "2008-12-24" - property variant jsdate: new Date(2008,11,24,14,15,38,200) // months are 0-based - - function formatDate(prop) { - var v = eval(prop) - return [ - Qt.formatDate(v), - Qt.formatDate(v, Qt.DefaultLocaleLongDate), - Qt.formatDate(v, "ddd MMMM d yy") - ] - } - - function formatTime(prop) { - var v = eval(prop) - return [ - Qt.formatTime(v), - Qt.formatTime(v, Qt.DefaultLocaleLongDate), - Qt.formatTime(v, "H:m:s a"), - Qt.formatTime(v, "hh:mm:ss.zzz") - ] - } - - function formatDateTime(prop) { - var v = eval(prop) - return [ - Qt.formatDateTime(v), - Qt.formatDateTime(v, Qt.DefaultLocaleLongDate), - Qt.formatDateTime(v, "M/d/yy H:m:s a") - ] - } - - // Error cases - property string err_date1: Qt.formatDate() - property string err_date2: Qt.formatDate(new Date, new Object) - - property string err_time1: Qt.formatTime() - property string err_time2: Qt.formatTime(new Date, new Object) - - property string err_dateTime1: Qt.formatDateTime() - property string err_dateTime2: Qt.formatDateTime(new Date, new Object) -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/hsla.qml b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml deleted file mode 100644 index ff9622b339..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/hsla.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property color test1: Qt.hsla(1, 0, 0, 0.8); - property color test2: Qt.hsla(1, 0.5, 0.3); - property color test3: Qt.hsla(1, 1); - property color test4: Qt.hsla(1, 1, 1, 1, 1); - property color test5: Qt.hsla(1.2, 1.3, 1.4, 1.5); - property color test6: Qt.hsla(-0.1, -0.2, -0.3, -0.4); -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml b/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml deleted file mode 100644 index 6829209518..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 - -QtObject { - id: root - - property QtObject nullObject - - property bool test1: Qt.isQtObject(root) - property bool test2: Qt.isQtObject(nullObject) - property bool test3: Qt.isQtObject(10) - property bool test4: Qt.isQtObject(null) - property bool test5: Qt.isQtObject({ a: 10, b: 11 }) -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml deleted file mode 100644 index 7db5e1edeb..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/lighter.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.lighter(Qt.rgba(1, 0.8, 0.3)) - property variant test2: Qt.lighter() - property variant test3: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8) - property variant test4: Qt.lighter("red"); - property variant test5: Qt.lighter("perfectred"); // Non-existant color - property variant test6: Qt.lighter(10); - property variant test7: Qt.lighter(Qt.rgba(1, 0.8, 0.3), 1.8, 5) -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/md5.qml b/tests/auto/declarative/qdeclarativeqt/data/md5.qml deleted file mode 100644 index bec1ed1fe7..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/md5.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string test1: Qt.md5() - property string test2: Qt.md5("Hello World") -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml b/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml deleted file mode 100644 index 37b9f513d9..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - Component.onCompleted: Qt.openUrlExternally("test:url") - - property bool testFile - onTestFileChanged: Qt.openUrlExternally("test.html") -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.js b/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.js deleted file mode 100644 index 702357afbf..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.js +++ /dev/null @@ -1,9 +0,0 @@ -.pragma library - -function loadTest() { - Qt.openUrlExternally("test:url") -} - -function loadFile() { - Qt.openUrlExternally("test.html") -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.qml b/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.qml deleted file mode 100644 index 4bf584d134..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 -import "openUrlExternally_lib.js" as Test - -Item { - Component.onCompleted: Test.loadTest(); - - property bool testFile - onTestFileChanged: Test.loadFile(); -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/point.qml b/tests/auto/declarative/qdeclarativeqt/data/point.qml deleted file mode 100644 index fe12ee6232..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/point.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.point(19, 34); - property variant test2: Qt.point(-3, 109.2); - property variant test3: Qt.point(-3); - property variant test4: Qt.point(-3, 109.2, 1); -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/quit.qml b/tests/auto/declarative/qdeclarativeqt/data/quit.qml deleted file mode 100644 index e3b91660e7..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/quit.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -QtObject { - Component.onCompleted: Qt.quit() -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/rect.qml b/tests/auto/declarative/qdeclarativeqt/data/rect.qml deleted file mode 100644 index b294b22c5b..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/rect.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.rect(10, 13, 100, 109) - property variant test2: Qt.rect(-10, 13, 100, 109.6) - property variant test3: Qt.rect(10, 13); - property variant test4: Qt.rect(10, 13, 100, 109, 10) - property variant test5: Qt.rect(10, 13, 100, -109) -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/resolvedUrl.qml b/tests/auto/declarative/qdeclarativeqt/data/resolvedUrl.qml deleted file mode 100644 index 06ef48b82b..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/resolvedUrl.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property string result - property bool isString: false - - Component.onCompleted: { - var a = Qt.resolvedUrl("resolvedUrl.qml"); - result = a; - isString = (typeof a) == "string" - } -} - diff --git a/tests/auto/declarative/qdeclarativeqt/data/rgba.qml b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml deleted file mode 100644 index 3b010f68cb..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/rgba.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property color test1: Qt.rgba(1, 0, 0, 0.8); - property color test2: Qt.rgba(1, 0.5, 0.3); - property color test3: Qt.rgba(1, 1); - property color test4: Qt.rgba(1, 1, 1, 1, 1); - property color test5: Qt.rgba(1.2, 1.3, 1.4, 1.5); - property color test6: Qt.rgba(-0.1, -0.2, -0.3, -0.4); -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/size.qml b/tests/auto/declarative/qdeclarativeqt/data/size.qml deleted file mode 100644 index 41051f4216..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/size.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.size(19, 34); - property variant test2: Qt.size(3, 109.2); - property variant test3: Qt.size(-3, 10); - property variant test4: Qt.size(3); - property variant test5: Qt.size(3, 109.2, 1); -} - - diff --git a/tests/auto/declarative/qdeclarativeqt/data/tint.qml b/tests/auto/declarative/qdeclarativeqt/data/tint.qml deleted file mode 100644 index 816e6e9b08..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/tint.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property color test1: Qt.tint("red", "blue"); - property color test2: Qt.tint(Qt.rgba(1, 0, 0), Qt.rgba(0, 0, 0, 0)); - property color test3: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5)); - property color test4: Qt.tint("red", Qt.rgba(0, 0, 1, 0.5), 10); - property color test5: Qt.tint("red") -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/vector.qml b/tests/auto/declarative/qdeclarativeqt/data/vector.qml deleted file mode 100644 index 5a949515ed..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/vector.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.vector3d(1, 0, 0.9); - property variant test2: Qt.vector3d(102, -10, -982.1); - property variant test3: Qt.vector3d(102, -10); - property variant test4: Qt.vector3d(102, -10, -982.1, 10); -} diff --git a/tests/auto/declarative/qdeclarativeqt/data/vector4.qml b/tests/auto/declarative/qdeclarativeqt/data/vector4.qml deleted file mode 100644 index 554dd1e9d4..0000000000 --- a/tests/auto/declarative/qdeclarativeqt/data/vector4.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 - -QtObject { - property variant test1: Qt.vector4d(1, 0, 0.9, 0.6); - property variant test2: Qt.vector4d(102, -10, -982.1, 10); - property variant test3: Qt.vector4d(102, -10, -982.1); - property variant test4: Qt.vector4d(102, -10, -982.1, 10, 15); -} |