Fixed a couple of failing auto tests.

QDeclarativeAudio test is using a fake backend initialised
to a specific volume. The test was testing against a
different volume.

QMediaPlayerWidgets was trying to include QApplication,
but from the wrong place and was not including QtWidgets
module.

Change-Id: I5ca108a040a4f4bd0d7550268f3a4ef5d790e755
Reviewed-on: http://codereview.qt-project.org/6458
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index 01d14f3..32d869a 100644 (file)
--- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -96,7 +96,7 @@ public:
         , m_duration(0)
         , m_position(0)
         , m_playbackRate(1.0)
-        , m_volume(50)
+        , m_volume(100)
         , m_bufferStatus(0)
         , m_muted(false)
         , m_audioAvailable(false)

diff --git a/tests/auto/qmediaplayerwidgets/main.cpp b/tests/auto/qmediaplayerwidgets/main.cpp
index 95903a5..e7614c9 100755 (executable)
--- a/tests/auto/qmediaplayerwidgets/main.cpp
+++ b/tests/auto/qmediaplayerwidgets/main.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtCore/qcoreapplication.h>
+#include <QtWidgets/QApplication>
 #include <QtTest/QtTest>
 
 #include "tst_qmediaplayerwidgets.h"

diff --git a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
index ec246ab..c5c6029 100644 (file)
--- a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qmediaplayerwidgets
 
-QT += network multimedia-private multimediawidgets-private testlib
+QT += network multimedia-private multimediawidgets-private testlib widgets
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += tst_qmediaplayerwidgets.h