diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:51:34 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:51:34 +1000 |
| commit | 40c5ec729758c769c76ea120d5dc23ce029a0e2b (patch) | |
| tree | 642fa7f003fd86877b86714494742e3d5243fa77 /examples/multimedia/audiodevices/audiodevices.cpp | |
| parent | eb15d0e412fc1ddb3f99da4ff7d57902da3a5a6d (diff) | |
| parent | add475cbc1c18c38e6df8b0b1317c86f5c7d1916 (diff) | |
| download | qtmultimedia-40c5ec729758c769c76ea120d5dc23ce029a0e2b.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
Squashed commit of changes from the 4.8-temp branch.
Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
Diffstat (limited to 'examples/multimedia/audiodevices/audiodevices.cpp')
| -rw-r--r-- | examples/multimedia/audiodevices/audiodevices.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp index 8af6ce74e..fcc433fb3 100644 --- a/examples/multimedia/audiodevices/audiodevices.cpp +++ b/examples/multimedia/audiodevices/audiodevices.cpp @@ -47,7 +47,7 @@ QString toString(QAudioFormat::SampleType sampleType) { - QString result("Unknown"); + QString result; switch (sampleType) { case QAudioFormat::SignedInt: result = "SignedInt"; @@ -58,7 +58,9 @@ QString toString(QAudioFormat::SampleType sampleType) case QAudioFormat::Float: result = "Float"; break; + default: case QAudioFormat::Unknown: + result = "Unknown"; break; } return result; |