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
2015-02-12 10:27:47 +00:00
2015-02-03 05:55:23 +00:00
2015-01-16 21:06:40 +01:00
2012-09-03 19:53:28 +02:00
2015-02-12 10:27:47 +00:00
2015-02-12 10:27:47 +00:00
2015-02-12 10:27:47 +00:00
Description
No description provided
17 MiB
Languages
C++ 90.5%
Objective-C++ 5.8%
QMake 1%
Objective-C 0.9%
QML 0.5%
Other 1%