summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-30 12:13:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-30 12:13:05 (GMT)
commitdb0c012d3eb5c5e30b0a932c5301cc03d43ba2ce (patch)
treec6e4311160a204120ed029592c97ad8094508e34 /tests/benchmarks
parent19a57f4e192267523fb815246b347bbc2054b736 (diff)
parent39d908a2e1bdbb25e23e75bb5a5c4fdeec0692c0 (diff)
downloadQt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.zip
Qt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.tar.gz
Qt-db0c012d3eb5c5e30b0a932c5301cc03d43ba2ce.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
Diffstat (limited to 'tests/benchmarks')
-rw-r--r--tests/benchmarks/declarative/compilation/data/BoomBlock.qml2
-rw-r--r--tests/benchmarks/declarative/creation/data/item.qml2
-rw-r--r--tests/benchmarks/declarative/creation/data/qobject.qml2
-rw-r--r--tests/benchmarks/declarative/creation/tst_creation.cpp2
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml2
-rw-r--r--tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/example.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/anchors/null.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/animation/large.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml2
-rw-r--r--tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml2
-rw-r--r--tests/benchmarks/declarative/script/data/CustomObject.qml2
-rw-r--r--tests/benchmarks/declarative/script/data/block.qml2
-rw-r--r--tests/benchmarks/declarative/script/data/global_prop.qml2
34 files changed, 34 insertions, 34 deletions
diff --git a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
index 3f43579..b757900 100644
--- a/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
+++ b/tests/benchmarks/declarative/compilation/data/BoomBlock.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import Qt.labs.particles 1.0
Item {
diff --git a/tests/benchmarks/declarative/creation/data/item.qml b/tests/benchmarks/declarative/creation/data/item.qml
index f1a7dbc..a6223d0 100644
--- a/tests/benchmarks/declarative/creation/data/item.qml
+++ b/tests/benchmarks/declarative/creation/data/item.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Item {
Item {}
diff --git a/tests/benchmarks/declarative/creation/data/qobject.qml b/tests/benchmarks/declarative/creation/data/qobject.qml
index bc6b152..33aeb57 100644
--- a/tests/benchmarks/declarative/creation/data/qobject.qml
+++ b/tests/benchmarks/declarative/creation/data/qobject.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {
}
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 94a67fd..6bf7943 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -130,7 +130,7 @@ void tst_creation::qobject_cpp()
void tst_creation::qobject_qml()
{
QDeclarativeComponent component(&engine);
- component.setData("import Qt 4.7\nQtObject {}", QUrl());
+ component.setData("import QtQuick 1.0\nQtObject {}", QUrl());
QObject *obj = component.create();
delete obj;
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
index df0d5b2..e484ef7 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object.qml
@@ -39,6 +39,6 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {}
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
index 399aa78..3ce3296 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/object_id.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {
id: blah
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
index 4b1d81c..073ed90 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import Qt.labs.particles 1.0
Item { id:block
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
index 5d67d25..6cf304c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.2.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {
property int a
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
index a22ba25..c4fc05c 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/synthesized_properties.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {
property int a
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
index 8c2f46b..90145e8 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/object.qml
@@ -39,6 +39,6 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Item {}
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
index 45748f5..29dfbe5 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/data/synthesized_object.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Item {
property int blah
diff --git a/tests/benchmarks/declarative/qmltime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml
index dca1429..4b6de1d 100644
--- a/tests/benchmarks/declarative/qmltime/example.qml
+++ b/tests/benchmarks/declarative/qmltime/example.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
index 6d8be03..f9418f8 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
index 5371c3d..ef6839f 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
index bb43dc6..b719001 100644
--- a/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
index 11bb6ba..d109313 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
index d40627f..6c055dc 100644
--- a/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
index 0499201..eed5339 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
index 9064bc2..cc27f04 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
index d27b2b6..7f8909d 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
index 0867d0b..05e287b 100644
--- a/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
index 416e0ea..7199a50 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Item {
Rectangle {}
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
index f610eb0..a668423 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
index 334e1b4..7070d91 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
index 507ed34..7bf14de 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
index 1092a9f..2b95d60 100644
--- a/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
index a125c54..417ec94 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
index 18c8fb4..3e9a076 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
index 2668c4c..d87aa32 100644
--- a/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
index 424f768..dc2fcb4 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/null.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
index f803b82..3adefbc 100644
--- a/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
+++ b/tests/benchmarks/declarative/qmltime/tests/vmemetaobject/property.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import QmlTime 1.0 as QmlTime
Item {
diff --git a/tests/benchmarks/declarative/script/data/CustomObject.qml b/tests/benchmarks/declarative/script/data/CustomObject.qml
index 1656453..97f6d39 100644
--- a/tests/benchmarks/declarative/script/data/CustomObject.qml
+++ b/tests/benchmarks/declarative/script/data/CustomObject.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
QtObject {
property real prop1: 0
diff --git a/tests/benchmarks/declarative/script/data/block.qml b/tests/benchmarks/declarative/script/data/block.qml
index f7b2ab3..4575050 100644
--- a/tests/benchmarks/declarative/script/data/block.qml
+++ b/tests/benchmarks/declarative/script/data/block.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
Rectangle {
width: 200; height: 200
diff --git a/tests/benchmarks/declarative/script/data/global_prop.qml b/tests/benchmarks/declarative/script/data/global_prop.qml
index 4fb7ee7..29bbb7d 100644
--- a/tests/benchmarks/declarative/script/data/global_prop.qml
+++ b/tests/benchmarks/declarative/script/data/global_prop.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
import "global.js" as Program
Rectangle {