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 /src/plugins/v4l | |
parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
download | qtmultimedia-03f22bcdaf1f80083618856d6e4140d3062f175b.tar.gz |
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 'src/plugins/v4l')
-rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.cpp | 6 | ||||
-rw-r--r-- | src/plugins/v4l/radio/v4lradiocontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/v4l/v4l.pro | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/v4l/radio/v4lradiocontrol.cpp b/src/plugins/v4l/radio/v4lradiocontrol.cpp index fe5357ec9..49182d50b 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.cpp +++ b/src/plugins/v4l/radio/v4lradiocontrol.cpp @@ -88,12 +88,12 @@ bool V4LRadioControl::isAvailable() const return available; } -QtMultimediaKit::AvailabilityError V4LRadioControl::availabilityError() const +QtMultimedia::AvailabilityError V4LRadioControl::availabilityError() const { if (fd > 0) - return QtMultimediaKit::NoError; + return QtMultimedia::NoError; else - return QtMultimediaKit::ResourceError; + return QtMultimedia::ResourceError; } QRadioTuner::State V4LRadioControl::state() const diff --git a/src/plugins/v4l/radio/v4lradiocontrol.h b/src/plugins/v4l/radio/v4lradiocontrol.h index 36e86f960..4e9f6eb57 100644 --- a/src/plugins/v4l/radio/v4lradiocontrol.h +++ b/src/plugins/v4l/radio/v4lradiocontrol.h @@ -65,7 +65,7 @@ public: ~V4LRadioControl(); bool isAvailable() const; - QtMultimediaKit::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityError availabilityError() const; QRadioTuner::State state() const; diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index 063a4c7ac..bc5c3d4a0 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -1,11 +1,11 @@ load(qt_module) TARGET = qtmedia_v4lengine -QT += multimediakit-private +QT += multimedia-private PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE} +DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} HEADERS += v4lserviceplugin.h SOURCES += v4lserviceplugin.cpp |