diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
| commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
| tree | 08fa39a9605ec38a45247baea0e2053179f5970f /tests/benchmarks/declarative/script/data | |
| parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 | |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
Diffstat (limited to 'tests/benchmarks/declarative/script/data')
| -rw-r--r-- | tests/benchmarks/declarative/script/data/CustomObject.qml | 2 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/script/data/block.qml | 2 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/script/data/global_prop.qml | 2 |
3 files changed, 3 insertions, 3 deletions
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 { |