Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/qsound/qsound.pro
index e3279f3..b69d084 100644
--- a/tests/auto/qsound/qsound.pro
+++ b/tests/auto/qsound/qsound.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 SOURCES += tst_qsound.cpp
 
 wince*|symbian: {
-   deploy.sources += 4.wav
+   deploy.files += 4.wav
    DEPLOYMENT += deploy
    !symbian:DEFINES += SRCDIR=\\\"\\\"
 } else {
diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/qsound/tst_qsound.cpp
index eda99a1..295ed91 100644
--- a/tests/auto/qsound/tst_qsound.cpp
+++ b/tests/auto/qsound/tst_qsound.cpp
@@ -63,6 +63,9 @@ private slots:
 
 void tst_QSound::checkFinished()
 {
+#if defined(Q_WS_QPA)
+    QSKIP("QSound is not implemented on Lighthouse", SkipAll);
+#else
     QSound sound(SRCDIR"4.wav");
     sound.setLoops(3);
     sound.play();
@@ -72,15 +75,17 @@ void tst_QSound::checkFinished()
     QEXPECT_FAIL("", "QSound buggy on embedded (task QTBUG-157)", Abort);
 #endif
     QVERIFY(sound.isFinished() );
+#endif
 }
 
 void tst_QSound::staticPlay()
 {
     QSKIP("Test disabled -- only for manual purposes", SkipAll);
-
+#if !defined(Q_WS_QPA)
     // Check that you hear sound with static play also.
     QSound::play(SRCDIR"4.wav");
     QTest::qWait(2000);
+#endif
 }
 
 QTEST_MAIN(tst_QSound);