Sergio Ahumada 41a1c16340 Merge remote-tracking branch 'origin/5.3' into 5.4 ...

Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0

2014-09-26 15:28:44 +02:00

..

testdata

Revert "QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing."

2014-09-17 13:11:07 +02:00

qmediaplaylist.pro

remove some unnecessary CONFIG additions

2012-12-16 22:01:36 +01:00

tst_qmediaplaylist.cpp

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

2014-09-26 15:28:44 +02:00