diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-10-12 07:41:09 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 04:29:05 +0200 |
| commit | 126addddb5e5a1928a8decf84e9e20655ac24f8d (patch) | |
| tree | d52d75348d253f4627a6ae7fbdb246eafc73fc00 /tests/auto | |
| parent | bc8841699fa34812394c819c55d96d8260fac443 (diff) | |
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>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 2 | ||||
| -rwxr-xr-x | tests/auto/qmediaplayerwidgets/main.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 01d14f3c9..32d869a90 100644 --- 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 95903a593..e7614c975 100755 --- 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 ec246ab65..c5c602938 100644 --- 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 |