diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 19:13:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 19:13:07 (GMT) |
| commit | 622f3c791b979864ad540e3c4c92b78b226edc08 (patch) | |
| tree | e4a5a16b659caeea8cf0355dbc39c99f9a4a4381 /qmake | |
| parent | 02fcd5e346da13cbb65523de2348880cf7d7a073 (diff) | |
| parent | f6f2d03b2d74b236d33a5ca32a49f138bf521c13 (diff) | |
| download | Qt-622f3c791b979864ad540e3c4c92b78b226edc08.zip Qt-622f3c791b979864ad540e3c4c92b78b226edc08.tar.gz Qt-622f3c791b979864ad540e3c4c92b78b226edc08.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Cocoa: p1 bug fix: fix auto test regressions
Ensure shared network session deleted from correct thread
Revert "Remove SIGBUS emission from QNetworkSession destruction."
Image w/ PreserveAspectFit has its width changed once more than needed.
Cocoa: p1 bug fix: revert use of subWindowStacking
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions