diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 04:44:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 04:44:26 (GMT) |
| commit | 8331e9700b830594d3c015308bf0aa351997862c (patch) | |
| tree | c274362e2c6a236af96b6c78d7f8858a939439cb /src/opengl/qpixmapdata_gl.cpp | |
| parent | 80f031dfca7c161de4461514dfd8d9d664ea2f03 (diff) | |
| parent | 3170828ee142be248c1acdee4e6677a7238d6e56 (diff) | |
| download | Qt-8331e9700b830594d3c015308bf0aa351997862c.zip Qt-8331e9700b830594d3c015308bf0aa351997862c.tar.gz Qt-8331e9700b830594d3c015308bf0aa351997862c.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:
Fix network request completion crashing on a canceled pixmap request
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
0 files changed, 0 insertions, 0 deletions