Frederik Gladhorn
|
659f238bbb
|
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
|
2014-09-01 12:52:51 +02:00 |
|
Bjoern Breitmeyer
|
b3c2dca466
|
Restore QWindowsAudio support on wince.
Enabled Audio playback with wave device on WindowsCE again.
Change-Id: Ic7749821ef8f991a909cbeb29083219ea988f5dc
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
|
2014-08-27 13:54:59 +02:00 |
|
Antti Kokko
|
2732e23887
|
Update license headers and add new license files
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
2014-08-24 17:30:13 +02:00 |
|
Christian Strømme
|
2d54da2d39
|
Move win32 and Alsa audio backends into plugins.
Change-Id: I9835cf5ee97900569f26421a19543b485e933051
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
|
2014-01-30 18:15:36 +01:00 |
|