diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 08:53:30 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 08:53:30 +1000 |
| commit | 41bb458f095bf796d3a083eaa1c9d547f3fed745 (patch) | |
| tree | a11c948e1bda056271a839fdc3eb923a0e6cb32e /tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp | |
| parent | f0c4a037f9ebd184dc25571fa591f89dba943105 (diff) | |
| parent | b03eac0d7d31c878fef7799367c148196de8a13f (diff) | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Migrate addMarkUp function to QChar.
update the proxy info before session is opened in QNAM by Aapo Makela
Dragging in nested views no longer works as expected
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix implicit height not growing when pre-edit text wraps.
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
Diffstat (limited to 'tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp')
0 files changed, 0 insertions, 0 deletions