diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /tests/auto/qaudiocapturesource | |
parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) |
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.
Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests/auto/qaudiocapturesource')
-rw-r--r-- | tests/auto/qaudiocapturesource/qaudiocapturesource.pro | 2 | ||||
-rw-r--r-- | tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro index 9addb194c..9a53b54a1 100644 --- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro +++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro @@ -1,6 +1,6 @@ load(qttest_p4) -QT += multimediakit-private +QT += multimedia-private CONFIG += no_private_qt_headers_warning SOURCES += tst_qaudiocapturesource.cpp diff --git a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp index f798d8f2c..d2620b8eb 100644 --- a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp +++ b/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp @@ -167,14 +167,14 @@ void tst_QAudioCaptureSource::testAvailability() QAudioCaptureSource source(0, &provider); QVERIFY(source.isAvailable() == false); - QVERIFY(source.availabilityError() == QtMultimediaKit::ServiceMissingError); + QVERIFY(source.availabilityError() == QtMultimedia::ServiceMissingError); service.hasControls = true; MockMediaServiceProvider provider2(&service); QAudioCaptureSource source2(0, &provider2); QVERIFY(source2.isAvailable() == true); - QVERIFY(source2.availabilityError() == QtMultimediaKit::NoError); + QVERIFY(source2.availabilityError() == QtMultimedia::NoError); } void tst_QAudioCaptureSource::testAvailableAudioInputChangedSignal() |