diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 16:09:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 16:09:20 (GMT) |
| commit | 02b0b0af952960f451a3aac570a2df0cc084bce7 (patch) | |
| tree | 9b5dea983b27fdf9aba5401cf575051d6ecce9b3 /tests/auto/declarative | |
| parent | 5a438bd30cf7d92309cbff51da523b7faea335f5 (diff) | |
| parent | 05b9dc5a1cc649231b29807f2a87bb7164c5234a (diff) | |
| download | Qt-02b0b0af952960f451a3aac570a2df0cc084bce7.zip Qt-02b0b0af952960f451a3aac570a2df0cc084bce7.tar.gz Qt-02b0b0af952960f451a3aac570a2df0cc084bce7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix memory leak in QtScript variable object
doc: Changed some titles so lists of contents sort better.
QSslSocket: fix security vulnerability with wildcard IP addresses
doc: Some reorganization of top page topic hierarchy.
Mac: Fix crash when using style to draw on other things than widgets
Doc: Adding radius support for CSS3 and webkit
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
...
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index d5a911a..db1f191 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -585,7 +585,7 @@ void tst_qdeclarativeinstruction::dump() << "45\t\t48\tDEFER\t\t\t7" << "46\t\tNA\tDEFER\t\t\t7" << "47\t\t48\tSTORE_IMPORTED_SCRIPT\t2" - << "48\t\t50\tXXX UNKOWN INSTRUCTION\t1234" + << "48\t\t50\tXXX UNKNOWN INSTRUCTION\t1234" << "49\t\t51\tSTORE_VARIANT_INTEGER\t\t32\t11" << "50\t\t52\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" << "-------------------------------------------------------------------------------"; |