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/src

Doc: Improved example documentation

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

histogramwidget.cpp

Update copyright year in Digia's license headers

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

histogramwidget.h

Update copyright year in Digia's license headers

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

main.cpp

Remove some Q_WS_MAEMO_6 instances from examples.

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

player.cpp

Prefer to use normalised signal/slot signatures

2014-03-03 12:12:31 +01:00

player.h

Update copyright year in Digia's license headers

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

player.pro

centralize and fixup example sources install targets

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

playercontrols.cpp

Update copyright year in Digia's license headers

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

playercontrols.h

Update copyright year in Digia's license headers

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

playlistmodel.cpp

Update copyright year in Digia's license headers

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

playlistmodel.h

Update copyright year in Digia's license headers

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

videowidget.cpp

Update copyright year in Digia's license headers

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

videowidget.h

Update copyright year in Digia's license headers

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