Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  QAudioOutput always uses default output device
  symbian: deploy 4.wav test file properly

3 files changed, 13 insertions, 9 deletions

diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index cf3726b..afae8b7 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -84,8 +84,7 @@ QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioF
     resuming = false;
     opened = false;
 
-    QStringList list1 = QString(QLatin1String(device)).split(QLatin1String(":"));
-    m_device = QByteArray(list1.at(0).toLocal8Bit().constData());
+    m_device = device;
 
     timer = new QTimer(this);
     connect(timer,SIGNAL(timeout()),SLOT(userFeed()));
@@ -282,11 +281,11 @@ bool QAudioOutputPrivate::open()
     int count=0;
     unsigned int freakuency=settings.frequency();
 
-    QString dev = QLatin1String(m_device.constData());
+    QString dev = QString(QLatin1String(m_device.constData()));
     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
     if(dev.compare(QLatin1String("default")) == 0) {
 #if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-        dev = QLatin1String(devices.first().constData());
+        dev = QLatin1String(devices.first());
 #else
         dev = QLatin1String("hw:0,0");
 #endif
diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro
index 8657edb..a6286ec 100644
--- a/tests/auto/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/qaudiooutput/qaudiooutput.pro
@@ -4,11 +4,13 @@ SOURCES += tst_qaudiooutput.cpp
 
 QT = core multimedia
 
-wince* {
+wince*|symbian*: {
     deploy.sources += 4.wav
     DEPLOYMENT = deploy
-    DEFINES += SRCDIR=\\\"\\\"
-    QT += gui
+    !symbian {
+        DEFINES += SRCDIR=\\\"\\\"
+        QT += gui
+    }
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index aeb2286..437ef5e 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -48,6 +48,9 @@
 #include <qaudio.h>
 #include <qaudioformat.h>
 
+#if defined(Q_OS_SYMBIAN)
+#define SRCDIR ""
+#endif
 
 class tst_QAudioOutput : public QObject
 {
@@ -131,7 +134,7 @@ void tst_QAudioOutput::notifyInterval()
 void tst_QAudioOutput::pullFile()
 {
     if(available) {
-        QFile file(SRCDIR "4.wav");
+        QFile file(SRCDIR"4.wav");
         QVERIFY(file.exists());
         file.open(QIODevice::ReadOnly);
 
@@ -178,7 +181,7 @@ void tst_QAudioOutput::pullFile()
 void tst_QAudioOutput::pushFile()
 {
     if(available) {
-        QFile file(SRCDIR "4.wav");
+        QFile file(SRCDIR"4.wav");
         QVERIFY(file.exists());
         file.open(QIODevice::ReadOnly);