Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +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	fix usage of wince scope	2015-06-05 10:29:10 +00:00
doc	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
draganddrop	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02: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 usage of wince scope	2015-06-05 10:29:10 +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	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
painting	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
richtext	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02: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	Add QRegularExpression based regexp tool	2015-04-02 13:19:30 +00:00
tutorials	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
widgets	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02: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