diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-02 16:06:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-02 16:06:13 (GMT) |
| commit | c5ac774717f1ec2c99407e3ee3c337127d94329e (patch) | |
| tree | d316abfff7585c3ff9b8c08ecf9ef8b6bd0d73b0 /tests/auto/mediaobject | |
| parent | 187185bf246b63f080cf2a59b6768756b399e72c (diff) | |
| parent | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff) | |
| download | Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.zip Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.gz Qt-c5ac774717f1ec2c99407e3ee3c337127d94329e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/mediaobject')
| -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; |