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/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml | |
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/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml')
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml index e6e1a70..ce516ac 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 Rectangle { width: 800; height: 450 |