Liang Qi 1925bb404e Merge remote-tracking branch 'origin/5.4' into 5.5 ...

Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19

2015-04-15 09:26:14 +02:00

..

camera

Remove BlackBerry PlayBook support.

2015-02-18 15:44:42 +00:00

common

Remove BlackBerry PlayBook support.

2015-02-18 15:44:42 +00:00

mediaplayer

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

2015-04-15 09:26:14 +02:00

bbserviceplugin.cpp

Update copyright headers

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

bbserviceplugin.h

Update copyright headers

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

blackberry_mediaservice.json

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

neutrino_mediaservice.json

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

neutrinoserviceplugin.cpp

Update copyright headers

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

neutrinoserviceplugin.h

Update copyright headers

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

qnx.pro

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00