Antti Kokko
bbfccc7135
Update copyright headers
...
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com >
2015-02-12 10:27:47 +00: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
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
Niels Weber
da77331952
Improve Magnify and Ripple effects on video shader example
...
Re-enable Magnify shader.
Use correct coordinates for Magnify and Ripple shader.
Task-number: QTBUG-38121
Change-Id: Ie8d962ba841d074c9ebcf3b86f948848ad6a1812
Reviewed-by: Topi Reiniö <topi.reinio@digia.com >
2014-08-18 14:05:22 +02:00
Niels Weber
4c8284de46
Rework qmlvideofx example
...
Task-number: QTBUG-38121
Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-04-18 20:10:23 +02:00
Sergio Ahumada
399500f87e
Update copyright year in Digia's license headers
...
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-10 17:56:01 +01:00
hjk
416168db8a
Polish and fix qmlvideofx example
...
Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6
Reviewed-by: hjk <qthjk@ovi.com >
2012-12-20 19:28:19 +01:00
Joerg Bornemann
6b4994c265
centralize and fixup example sources install targets
...
This follows suit with aeb036e in qtbase.
Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: hjk <qthjk@ovi.com >
2012-12-05 18:20:35 +01:00
