diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 13:53:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 13:53:58 (GMT) |
| commit | c78fb096c31df3b7d3cd9018f26518f59f4fde65 (patch) | |
| tree | d91b05f1bd3b242f70c662891df02910723acbc9 /doc | |
| parent | 62f952daa97d7a85d62f839bef2a3d015e7bb9e0 (diff) | |
| parent | a193ee2dd7e28d814b8ab81287e00fdacf300369 (diff) | |
| download | Qt-c78fb096c31df3b7d3cd9018f26518f59f4fde65.zip Qt-c78fb096c31df3b7d3cd9018f26518f59f4fde65.tar.gz Qt-c78fb096c31df3b7d3cd9018f26518f59f4fde65.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
MediaServices; Don't look at the debug info when looking for plugins.
Fix attempted invocation of non-existent timerActivated() slot.
Fix up qdocs for mediaservices namespace.
fix nmake build with win32-msvc2010
Added mkspec for MSVC 2010
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions