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: (26 commits)
  Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
  Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
  Doc: Relicensed the documentation under the GNU FDL version 1.3.
  doc: Added more DITA output to the XML generator
  Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
  Fix for a leak in the mac style.
  Doc: Fixing bugs to style and script
  doc: Added more DITA output to the XML generator
  Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
  Fix compiler warnings in QtGui (text,painting).
  Allow Unix to generate unique UUIDs if /dev/urandom exists.
  Allow GNU Free Documentation license header.
  Add missing license header.
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
  Fix example compile and runtime warnings, webkit examples not built.
  qgl_cl_p.h is no longer existent
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
  Doc: Fixed documentation errors.
  doc: Added more DITA output to the XML generator
  doc: Fixed type of Package::name
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 5dc2ef1..5ab4918 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -58,6 +58,8 @@ QString toString(QAudioFormat::SampleType sampleType)
     case QAudioFormat::Float:
         result = "Float";
         break;
+    case QAudioFormat::Unknown:
+        break;
     }
     return result;
 }