diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-03 19:30:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-03 19:30:07 (GMT) |
| commit | 33c1942934d65aaf782f89bf60affdda0b91c2ca (patch) | |
| tree | b36aa2012f1f9c4ab09f068271b8b557e652fda4 /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
| parent | ecca301bd0a9db778b97852953b49f3971b6cecc (diff) | |
| parent | 098436fabc56fb54b28038c9132c8d0961ec2b63 (diff) | |
| download | Qt-33c1942934d65aaf782f89bf60affdda0b91c2ca.zip Qt-33c1942934d65aaf782f89bf60affdda0b91c2ca.tar.gz Qt-33c1942934d65aaf782f89bf60affdda0b91c2ca.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 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions