diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-05 13:20:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-05 13:20:04 (GMT) |
| commit | b687323d13aca4f3684413231a996b30d19cab25 (patch) | |
| tree | 017e3f644a17d93942917fe93c706852c0146081 /src/plugins | |
| parent | c96047c0495c58b56a73873fd235ce859e0e9255 (diff) | |
| parent | 33c1942934d65aaf782f89bf60affdda0b91c2ca (diff) | |
| download | Qt-b687323d13aca4f3684413231a996b30d19cab25.zip Qt-b687323d13aca4f3684413231a996b30d19cab25.tar.gz Qt-b687323d13aca4f3684413231a996b30d19cab25.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Partially revert "Remove qWait functions as it is used in QTRY_* macros."
Remove qWait functions as it is used in QTRY_* macros.
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions