Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
images	New Qt logo	2014-11-05 08:10:42 +01:00
scripts	Doc: Update the online documentation template	2015-03-11 09:17:39 +00:00
style	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00