Frederik Gladhorn 39bb642cb2 Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	qtmultimedia.pro
	src/gsttools/qgstreamervideowidget.cpp
	src/plugins/gstreamer/camerabin/camerabinservice.cpp

Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99
2015-02-24 17:38:46 +01:00
2015-02-12 10:27:47 +00:00
2015-02-03 05:55:23 +00:00
2015-01-16 21:06:40 +01:00
2012-09-03 19:53:28 +02:00
2015-02-12 10:27:47 +00:00
2015-02-12 10:27:47 +00:00
2015-02-12 10:27:47 +00:00
Description
No description provided
17 MiB
Languages
C++ 90.5%
Objective-C++ 5.8%
QMake 1%
Objective-C 0.9%
QML 0.5%
Other 1%