diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 15:36:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-18 15:36:32 (GMT) |
| commit | c4a842563d40e8b4c3693a8acb77c9aff6f06e29 (patch) | |
| tree | ceb8542f17ca2879db1831c4d018efb629234dc5 /demos/browser/networkaccessmanager.cpp | |
| parent | a764519a658031ce2fb375b659ff889b5241357f (diff) | |
| parent | 102f415e39772086e9066f2e9954c0c22725a23e (diff) | |
| download | Qt-c4a842563d40e8b4c3693a8acb77c9aff6f06e29.zip Qt-c4a842563d40e8b4c3693a8acb77c9aff6f06e29.tar.gz Qt-c4a842563d40e8b4c3693a8acb77c9aff6f06e29.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QSslCertificate issues
Change the prefered content size of the anomaly browser
Avoid painting while loading in the anomaly demo browser
QFile::readData: Simplify code
If the file is open, there must be an engine.
QFile: Fix a pre-mature pessimization
don't assert when calling QtScript-wrapped method of deleted QObject
Diffstat (limited to 'demos/browser/networkaccessmanager.cpp')
0 files changed, 0 insertions, 0 deletions