Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

3 files changed, 16 insertions, 1 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 8af6ce7..fcc433f 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;
diff --git a/examples/multimedia/audiodevices/audiodevices.desktop b/examples/multimedia/audiodevices/audiodevices.desktop
new file mode 100644
index 0000000..ffff4b4
--- /dev/null
+++ b/examples/multimedia/audiodevices/audiodevices.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=Audio Devices
+Exec=/opt/usr/bin/audiodevices
+Icon=audiodevices
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
index 1cb4679..c128664 100644
--- a/examples/multimedia/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audiodevices/audiodevices.pro
@@ -15,3 +15,5 @@ symbian {
     TARGET.UID3 = 0xA000D7BE
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+