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

..

content

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

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

audioengine.qml

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

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

audioengine.qmlproject

centralize and fixup example sources install targets

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