diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 23:42:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 23:42:32 (GMT) |
commit | c00b6a953d08fe9b13fa61f1e4acdb937885aa03 (patch) | |
tree | e5b10eedb304e04a26206ea2247cd52c87ef11b4 /tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | |
parent | b0e73713e0142ac1045b4c91c7fe55e8e965b7c2 (diff) | |
parent | 1b0bc13c14083d6146517ba1d8a63a6a503733b9 (diff) | |
download | Qt-c00b6a953d08fe9b13fa61f1e4acdb937885aa03.zip Qt-c00b6a953d08fe9b13fa61f1e4acdb937885aa03.tar.gz Qt-c00b6a953d08fe9b13fa61f1e4acdb937885aa03.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize tst_qlineedit.cpp
QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow
Fix QLineEdit's Highlight color when inactive.
Diffstat (limited to 'tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp')
0 files changed, 0 insertions, 0 deletions