Liang Qi fcfd31c9fd Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0		2015-06-01 17:46:58 +02:00
..
animation	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
desktop	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
dialogs	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
doc	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
draganddrop	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
effects	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
gestures	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
graphicsview	Fix exclusion for legacy Open GL examples.	2015-05-15 13:39:56 +00:00
itemviews	Polish the Dir View example.	2015-03-06 18:09:42 +00:00
layouts	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mac	Fixed license headers	2015-02-17 18:46:09 +00:00
mainwindows	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
painting	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
richtext	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
scroller	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
statemachine	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
tools	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
tutorials	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
widgets	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
windowcontainer	Make the windowcontainer example more robust	2015-05-12 08:58:47 +00:00
widgets.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00