diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 18:28:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 18:28:42 (GMT) |
| commit | 55ea900361418aed0c23c0f0023a88b022c2b55d (patch) | |
| tree | 9ac915b17e36a591e6bdca39f74e391a155dbb0f /src/gui/kernel/qmime_mac.cpp | |
| parent | 109ece623d8a973a2d97263309aa32bceab7e210 (diff) | |
| parent | 1ef309e964753105e14a8c223a1b59c0cbd9369b (diff) | |
| download | Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.zip Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.tar.gz Qt-55ea900361418aed0c23c0f0023a88b022c2b55d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
QHostInfo: fix a race condition under CE
Diffstat (limited to 'src/gui/kernel/qmime_mac.cpp')
0 files changed, 0 insertions, 0 deletions