Fixed qtmultimedia mock which was generating errors in tests
Approved by: Lukáš Tinkl, PS Jenkins bot, Daniel d'Andrada
commit3522024783a0a0ffd1bcafab206573f2eae17b3f
authorNick Dedekind <nick.dedekind@canonical.com>
dateThu 2 Jul 2015, 16:09 (11 years ago)
parent5201c8032f5a8a
tests/mocks/QtMultimedia/audio.cpp+1−1
@@ -108,7 +108,7 @@ void Audio::timerEvent()
108108
109109Audio::AudioRole Audio::audioRole() const
110110{
111− return Audio::MultimediaRole;
111+ return Audio::multimedia;
112112}
113113
114114void Audio::setAudioRole(Audio::AudioRole audioRole)
tests/mocks/QtMultimedia/audio.h+4−4
@@ -42,10 +42,10 @@ public:
4242 };
4343
4444 enum AudioRole {
45− AlarmRole,
46− AlertRole,
47− MultimediaRole,
48− PhoneRole
45+ alarm,
46+ alert,
47+ multimedia,
48+ phone
4949 };
5050
5151 explicit Audio(QObject *parent = 0);
tests/mocks/QtMultimedia/plugin.cpp+1
@@ -25,4 +25,5 @@ void MockQtMultimediaPlugin::registerTypes(const char *uri)
2525{
2626 Q_ASSERT(uri == QLatin1String("QtMultimedia"));
2727 qmlRegisterType<Audio>(uri, 5, 0, "Audio");
28+ qmlRegisterType<Audio>(uri, 5, 0, "MediaPlayer");
2829}