Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 14 insertions, 4 deletions

diff --git a/examples/multimedia/audio/audiodevices/audiodevices.cpp b/examples/multimedia/audio/audiodevices/audiodevices.cpp
index 52aa4db..0d305ff 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audio/audiodevices/audiodevices.cpp
@@ -58,6 +58,14 @@ AudioDevicesBase::~AudioDevicesBase() {}
 AudioTest::AudioTest( QMainWindow *parent, Qt::WFlags f )
     : AudioDevicesBase( parent, f )
 {
+    nearestFreq->setDisabled(true);
+    nearestChannel->setDisabled(true);
+    nearestCodec->setDisabled(true);
+    nearestSampleSize->setDisabled(true);
+    nearestSampleType->setDisabled(true);
+    nearestEndian->setDisabled(true);
+    logOutput->setDisabled(true);
+
     mode = QAudio::AudioOutput;
     modeBox->addItem("Input");
     modeBox->addItem("Output");
@@ -87,6 +95,8 @@ AudioTest::~AudioTest()
 void AudioTest::test()
 {
     // tries to set all the settings picked.
+    logOutput->clear();
+    logOutput->append("NOTE: an invalid codec audio/test exists for testing, to get a fail condition.");
 
     if(device) {
         if(device->isFormatSupported(settings)) {
@@ -179,7 +189,7 @@ void AudioTest::deviceChanged(int idx)
     if(codecz.size())
         settings.setCodec(codecz.at(0));
     // Add false to create failed condition!
-    codecsBox->addItem("audio/mpeg");
+    codecsBox->addItem("audio/test");
 
     sampleSizesBox->clear();
     QList<int> sampleSizez = device->supportedSampleSizes();
diff --git a/examples/multimedia/audio/audiodevices/audiodevicesbase.ui b/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
index 29dd40e..5207338 100644
--- a/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
+++ b/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
@@ -14,8 +14,8 @@
    <string>AudioDevicesBase</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="deviceLabel">
@@ -222,7 +222,7 @@
      <x>0</x>
      <y>0</y>
      <width>504</width>
-     <height>22</height>
+     <height>19</height>
     </rect>
    </property>
   </widget>