Sergio Ahumada d691f5ca2b Merge remote-tracking branch 'origin/5.3' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f

2014-06-14 21:59:24 +02:00

..

doc

Doc: Improved example documentation

2014-04-14 06:45:43 +02:00

camera.cpp

Remove some Q_WS_MAEMO_6 instances from examples.

2014-05-12 12:28:44 +02:00

camera.h

add error handling in image capturing in camera

2013-02-19 17:55:08 +01:00

camera.pro

centralize and fixup example sources install targets

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

camera.ui

add error handling in image capturing in camera

2013-02-19 17:55:08 +01:00

imagesettings.cpp

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

imagesettings.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

imagesettings.ui

centralize and fixup example sources install targets

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

main.cpp

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

videosettings.cpp

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

videosettings.h

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

videosettings.ui

centralize and fixup example sources install targets

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