diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-04-26 11:34:16 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-04-26 11:34:16 (GMT) |
| commit | 7cfb1403dc66e9151edc5a6c9b723444f2584941 (patch) | |
| tree | 5884070ffaee8f7b5774dedcce6994437dcb43fe /tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml | |
| parent | 4dba5cc0085482dccfbe70d8c157e094296feed1 (diff) | |
| parent | 2ee996bb3e8449e9c9d153326a2f55bc07b6b864 (diff) | |
| download | Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.zip Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.tar.gz Qt-7cfb1403dc66e9151edc5a6c9b723444f2584941.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
tools/assistant/tools/assistant/helpviewer.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml index 6411609..6bcae0f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml @@ -1,5 +1,5 @@ import Test 1.0 -import Qt 4.6 +import Qt 4.7 QtObject { default property int intProperty : 10 property bool boolProperty: false |