diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 10:13:32 (GMT) |
commit | 03686225036ebfc5cf78e3fcc66f5810a140c7d2 (patch) | |
tree | e35bcaf151edb27b5e48fc989c6727039c397f5b /tests/benchmarks/declarative | |
parent | 194013d9db1b3e4ba6f56a864f3b64f523202948 (diff) | |
parent | 72599ca45c416f2f0a9654412c14a148ca3d728c (diff) | |
download | Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.zip Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.tar.gz Qt-03686225036ebfc5cf78e3fcc66f5810a140c7d2.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: (47 commits)
Optimize QML "parent" property access
Begin dragging PathView up to the level (quality and functionality) of other views.
Rename qdeclarativetime -> qmltime
Auto-test fix.
Build Fix and port to new width and height properties
Port Flickable and Flipable to support QGraphicsObject.
Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef
Fix the build due to new properties in QGraphicsObject.
Remove the children property from QDeclarativeItem.
Rename qdeclarativetime -> qmltime
Update AnchorChanges to use more natural form for setting anchors.
Pen is not a creatable type.
Begin dragging PathView up to the level (quality and functionality) of other views.
Fix error reporting when symbian file copy fails.
Stabilize QGraphicsEffect test on X11
QIODevice::read() and QFile::atEnd() performance improvements
Clarified pkg_prerules usage documentation.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Made it possible to define more than one language using pkg_prerules
Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero
...
Diffstat (limited to 'tests/benchmarks/declarative')
-rw-r--r-- | tests/benchmarks/declarative/declarative.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/example.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/example.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/qmltime.cpp (renamed from tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/qmltime.pro (renamed from tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/anchors/null.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/animation/large.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/animation/large.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/animation/largeNoProps.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/loader/Loaded.qml) | 0 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/loader/component_loader.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/loader/empty_loader.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/loader/no_loader.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/loader/source_loader.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml) | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml (renamed from tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml) | 4 |
21 files changed, 39 insertions, 39 deletions
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro index 38ea6c4..a7d426c 100644 --- a/tests/benchmarks/declarative/declarative.pro +++ b/tests/benchmarks/declarative/declarative.pro @@ -8,4 +8,4 @@ SUBDIRS += \ qdeclarativeimage \ qdeclarativemetaproperty \ script \ - qdeclarativetime + qmltime diff --git a/tests/benchmarks/declarative/qdeclarativetime/example.qml b/tests/benchmarks/declarative/qmltime/example.qml index dd6185d..68889f0 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/example.qml +++ b/tests/benchmarks/declarative/qmltime/example.qml @@ -1,11 +1,11 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { property string name: "Bob Smith" - QDeclarativeTime.Timer { + QmlTime.Timer { component: Item { Text { text: name } } diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp index 20f0d93d..3932e01 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp +++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp @@ -156,7 +156,7 @@ int main(int argc, char ** argv) { QApplication app(argc, argv); - qmlRegisterType<Timer>("QDeclarativeTime", 1, 0, "Timer"); + qmlRegisterType<Timer>("QmlTime", 1, 0, "Timer"); uint iterations = 1024; QString filename; @@ -228,4 +228,4 @@ int main(int argc, char ** argv) return 0; } -#include "qdeclarativetime.moc" +#include "qmltime.moc" diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro index 7902ee1..9352f3b 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.pro +++ b/tests/benchmarks/declarative/qmltime/qmltime.pro @@ -1,10 +1,10 @@ load(qttest_p4) TEMPLATE = app -TARGET = qdeclarativetime +TARGET = qmltime QT += declarative macx:CONFIG -= app_bundle -SOURCES += qdeclarativetime.cpp +SOURCES += qmltime.cpp symbian* { TARGET.CAPABILITY = "All -TCB" diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml index 8d93594..31c879b 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/empty.qml +++ b/tests/benchmarks/declarative/qmltime/tests/anchors/empty.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Item { diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml index 918c48a..23fe78e 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/fill.qml +++ b/tests/benchmarks/declarative/qmltime/tests/anchors/fill.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Item { diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml index bb84538..bc447ef 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/anchors/null.qml +++ b/tests/benchmarks/declarative/qmltime/tests/anchors/null.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Item { diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/large.qml b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml index 978e3bf..c1cdb68 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/large.qml +++ b/tests/benchmarks/declarative/qmltime/tests/animation/large.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { ParallelAnimation { NumberAnimation { duration: 500 } diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/largeNoProps.qml b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml index cceb3f4..3db9f08 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/animation/largeNoProps.qml +++ b/tests/benchmarks/declarative/qmltime/tests/animation/largeNoProps.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { ParallelAnimation { NumberAnimation { } diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml index 3387a32..996602c 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/children.qml +++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/children.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { children: [ diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml index a8b653c..9f79c34 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/data.qml +++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/data.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { data: [ diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml index 0a507d4..f228c2a 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/no_creation.qml +++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/no_creation.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { } diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml index 227d8ad..335aeb8 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/item_creation/resources.qml +++ b/tests/benchmarks/declarative/qmltime/tests/item_creation/resources.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { resources: [ diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/Loaded.qml b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml index 6f8d849..6f8d849 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/Loaded.qml +++ b/tests/benchmarks/declarative/qmltime/tests/loader/Loaded.qml diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/component_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml index 270add4..65d5010 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/component_loader.qml +++ b/tests/benchmarks/declarative/qmltime/tests/loader/component_loader.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Loader { diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/empty_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml index d3b84cc..2dfe922 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/empty_loader.qml +++ b/tests/benchmarks/declarative/qmltime/tests/loader/empty_loader.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Loader {} diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/no_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml index a94a12a..1fa0d3b 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/no_loader.qml +++ b/tests/benchmarks/declarative/qmltime/tests/loader/no_loader.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Loaded {} diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/source_loader.qml b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml index 39ed1a6..33bb91c 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/loader/source_loader.qml +++ b/tests/benchmarks/declarative/qmltime/tests/loader/source_loader.qml @@ -1,9 +1,9 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Loader { diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml index c1f54a4..97bad47 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/no_positioner.qml +++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/no_positioner.qml @@ -1,8 +1,8 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Rectangle { } diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml index d49ff78..36dda15 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/null_positioner.qml +++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/null_positioner.qml @@ -1,8 +1,8 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Rectangle { } diff --git a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml index 05ca804..396e27d 100644 --- a/tests/benchmarks/declarative/qdeclarativetime/tests/positioner_creation/positioner.qml +++ b/tests/benchmarks/declarative/qmltime/tests/positioner_creation/positioner.qml @@ -1,8 +1,8 @@ import Qt 4.6 -import QDeclarativeTime 1.0 as QDeclarativeTime +import QmlTime 1.0 as QmlTime Item { - QDeclarativeTime.Timer { + QmlTime.Timer { component: Component { Item { Rectangle { } |