on xenial help sign in
Fixed qtmultimedia mock which was generating errors in tests
3522024Nick Dedekind
tests/mocks/QtMultimedia/audio.cpp+1−1
@@ -108,7 +108,7 @@ void Audio::timerEvent()
108
108
109Audio::AudioRole Audio::audioRole() const
109Audio::AudioRole Audio::audioRole() const
110{
110{
111− return Audio::MultimediaRole;
111+ return Audio::multimedia;
112}
112}
113
113
114void Audio::setAudioRole(Audio::AudioRole audioRole)
114void Audio::setAudioRole(Audio::AudioRole audioRole)
tests/mocks/QtMultimedia/audio.h+4−4
@@ -42,10 +42,10 @@ public:
42 };
42 };
43
43
44 enum AudioRole {
44 enum AudioRole {
45− AlarmRole,
45+ alarm,
46− AlertRole,
46+ alert,
47− MultimediaRole,
47+ multimedia,
48− PhoneRole
48+ phone
49 };
49 };
50
50
51 explicit Audio(QObject *parent = 0);
51 explicit Audio(QObject *parent = 0);
tests/mocks/QtMultimedia/plugin.cpp+1
@@ -25,4 +25,5 @@ void MockQtMultimediaPlugin::registerTypes(const char *uri)
25{
25{
26 Q_ASSERT(uri == QLatin1String("QtMultimedia"));
26 Q_ASSERT(uri == QLatin1String("QtMultimedia"));
27 qmlRegisterType<Audio>(uri, 5, 0, "Audio");
27 qmlRegisterType<Audio>(uri, 5, 0, "Audio");
28+ qmlRegisterType<Audio>(uri, 5, 0, "MediaPlayer");
28}
29}