Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
qwindow.pro	Fix linking of tst_qwindow with dynamic Open GL.	2014-09-08 21:43:06 +02:00
tst_qwindow.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +01:00