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
..
doc/src	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
imagegestures.pro	Doc: corrected link/example errors	2014-01-31 16:18:07 +01:00
imagewidget.cpp	doc: imagegestures example: document the pinch handler	2015-03-03 13:30:25 +00:00
imagewidget.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
main.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mainwidget.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
mainwidget.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00