slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
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>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/v4l/radio/v4lradiocontrol.cpp
View File

@@ -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

2
src/plugins/v4l/radio/v4lradiocontrol.h
View File

@@ -65,7 +65,7 @@ public:
~V4LRadioControl();
bool isAvailable() const;
QtMultimediaKit::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityError availabilityError() const;
QRadioTuner::State state() const;

4
src/plugins/v4l/v4l.pro
View File

@@ -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