diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 04:54:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 04:54:42 (GMT) |
| commit | fdfa49603baaf98dde1da355615ab4a5c770bdac (patch) | |
| tree | 6e16634e4eb8ba7ad09097e2f21607e0145447ac /tests | |
| parent | 54e76e5aa6c957387461fd6f07149ccaf312b877 (diff) | |
| parent | c046fc774ebfabfe83f197d8423c37a34404ad9a (diff) | |
| download | Qt-fdfa49603baaf98dde1da355615ab4a5c770bdac.zip Qt-fdfa49603baaf98dde1da355615ab4a5c770bdac.tar.gz Qt-fdfa49603baaf98dde1da355615ab4a5c770bdac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix poor English in QStyle::polish documentation.
Fix a few typos in comments and docs.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 322e2e4..d2c6f0f 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -682,7 +682,7 @@ void tst_MediaObject::testPauseOnFinish() } void tst_MediaObject::testReconnectBetweenTwoMediaObjects(){ - // Purpose: Test that phonon can handle swithing the same sink + // Purpose: Test that phonon can handle switching the same sink // between different media objects. Phonon::MediaObject obj1; |