Yoann Lopes 9d2943bce8 Merge remote-tracking branch 'origin/5.4' into 5.5 ...

Conflicts:
	.qmake.conf
	src/plugins/avfoundation/camera/avfcamerasession.h
	src/plugins/avfoundation/camera/avfcamerasession.mm

Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85

2015-05-05 11:48:21 +02:00

..

android

Rework qmlvideofx example

2014-04-18 20:10:23 +02:00

images

Rework qmlvideofx example

2014-04-18 20:10:23 +02:00

qml/qmlvideofx

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

2015-05-05 11:48:21 +02:00

qmlapplicationviewer

Update copyright headers

2015-02-12 10:27:47 +00:00

shaders

Update copyright headers

2015-02-12 10:27:47 +00:00

filereader.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

filereader.h

Update copyright headers

2015-02-12 10:27:47 +00:00

Info.plist

Rework qmlvideofx example

2014-04-18 20:10:23 +02:00

main.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmlvideofx.png

centralize and fixup example sources install targets

2012-12-05 18:20:35 +01:00

qmlvideofx.pro

Rework qmlvideofx example

2014-04-18 20:10:23 +02:00

qmlvideofx.qrc

Restore ContentCamera.qml

2015-04-16 20:19:22 +00:00

qmlvideofx.svg

centralize and fixup example sources install targets

2012-12-05 18:20:35 +01:00

trace.h

Fix debug stream operators.

2015-04-07 17:21:38 +00:00