diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 07:32:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 07:32:40 (GMT) |
| commit | a8b5200403742272811f095c0710193a27eed466 (patch) | |
| tree | e400285c95374df1519abb4a13af82c2ae8c3182 /tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | |
| parent | 267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a (diff) | |
| parent | 5278c12ff3c6d8e467fe4034120e258fdaa90b80 (diff) | |
| download | Qt-a8b5200403742272811f095c0710193a27eed466.zip Qt-a8b5200403742272811f095c0710193a27eed466.tar.gz Qt-a8b5200403742272811f095c0710193a27eed466.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:
Fix spelling in enumeration.
Fixed compiler warning
QuickTime movie view output: emit the natural size changes
Diffstat (limited to 'tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp')
| -rw-r--r-- | tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index d839fe5..06a8f60 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -152,7 +152,7 @@ public: Q_UNUSED(codecs); if (mimeType == "audio/wav") - return QtMultimedia::PreferedService; + return QtMultimedia::PreferredService; return QtMultimedia::NotSupported; } |