Merge remote-tracking branch 'origin/5.3' into 5.4 (659f238b) · Commits · BC / public / external / Qt / QtMultimedia

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 659f238b authored 10 years ago by

Frederik Gladhorn

Browse files

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

parents 80ba1d63 1dba07b6

Hide whitespace changes

Inline Side-by-side

Showing with 249 additions and 59 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/5.3' into 5.4