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>
This commit is contained in:
@@ -96,7 +96,7 @@ public:
|
|||||||
, m_duration(0)
|
, m_duration(0)
|
||||||
, m_position(0)
|
, m_position(0)
|
||||||
, m_playbackRate(1.0)
|
, m_playbackRate(1.0)
|
||||||
, m_volume(50)
|
, m_volume(100)
|
||||||
, m_bufferStatus(0)
|
, m_bufferStatus(0)
|
||||||
, m_muted(false)
|
, m_muted(false)
|
||||||
, m_audioAvailable(false)
|
, m_audioAvailable(false)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
** $QT_END_LICENSE$
|
** $QT_END_LICENSE$
|
||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#include <QtCore/qcoreapplication.h>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QtTest/QtTest>
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
#include "tst_qmediaplayerwidgets.h"
|
#include "tst_qmediaplayerwidgets.h"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
CONFIG += testcase
|
CONFIG += testcase
|
||||||
TARGET = tst_qmediaplayerwidgets
|
TARGET = tst_qmediaplayerwidgets
|
||||||
|
|
||||||
QT += network multimedia-private multimediawidgets-private testlib
|
QT += network multimedia-private multimediawidgets-private testlib widgets
|
||||||
CONFIG += no_private_qt_headers_warning
|
CONFIG += no_private_qt_headers_warning
|
||||||
|
|
||||||
HEADERS += tst_qmediaplayerwidgets.h
|
HEADERS += tst_qmediaplayerwidgets.h
|
||||||
|
|||||||
Reference in New Issue
Block a user