diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-31 08:12:41 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-31 08:12:41 (GMT) |
| commit | a833d593da01d7ecf48eda4e62514ed56fb2be97 (patch) | |
| tree | 963df96ca269f56b3c0b4912d5b73de3bfe4c07d /src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp | |
| parent | 456fdf4e5fe05e94955df0fc7d76c384a0bcfbc5 (diff) | |
| parent | edd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff) | |
| download | Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.zip Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.tar.gz Qt-a833d593da01d7ecf48eda4e62514ed56fb2be97.tar.bz2 | |
Merge commit 'origin/4.7' into symbian47
Conflicts:
src/3rdparty/webkit/WebCore/WebCore.pro
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp index 406cefe11..4ecf10b 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp @@ -117,6 +117,7 @@ void QGstreamerVideoInputDeviceControl::update() m_names.clear(); m_descriptions.clear(); +#ifdef QMEDIA_GSTREAMER_CAPTURE QDir devDir("/dev"); devDir.setFilter(QDir::System); @@ -157,6 +158,7 @@ void QGstreamerVideoInputDeviceControl::update() } ::close(fd); } +#endif } QT_END_NAMESPACE |