Friedemann Kleint
4459561dd5
Add missing includes for QDataStream/QIODevice.
...
After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.
Change-Id: Ibe3e1e6542e1b592adaabe3f8ffd3268efaf289b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com >
2015-01-07 23:11:16 +01:00
Sergio Ahumada
41a1c16340
Merge remote-tracking branch 'origin/5.3' into 5.4
...
Conflicts:
.qmake.conf
Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
2014-09-26 15:28:44 +02:00
Yoann Lopes
18d6560db1
Fix integer overflow in several audio plugins.
...
Task-number: QTBUG-40804
Change-Id: If006cb7db319bb6fda4ce7eb4f907e897b5d9efa
Reviewed-by: Christian Stromme <christian.stromme@digia.com >
2014-09-09 13:46:19 +02:00
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
