diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 02:35:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 02:35:28 (GMT) |
| commit | b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be (patch) | |
| tree | b9c4adba9bf64a3f8f62d1b1299f5083f3896ea2 /tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml | |
| parent | 4889729b32b30a4bad90a0add8ca444529dea2e7 (diff) | |
| parent | f2219ce983098fc14655d8f3bb8a7fee2c9abe4d (diff) | |
| download | Qt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.zip Qt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.tar.gz Qt-b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be.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:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml index 8addcb9..6467c42 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml @@ -1,5 +1,5 @@ import Qt.test 1.0 MyQmlObject { - onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c) + onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c + ' ' + d + ' ' + e) } |