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
..
qbrush	Update copyright headers	2015-02-11 06:49:51 +00:00
qcolor	Update copyright headers	2015-02-11 06:49:51 +00:00
qpagelayout	Update copyright headers	2015-02-11 06:49:51 +00:00
qpagesize	Update copyright headers	2015-02-11 06:49:51 +00:00
qpaintengine	Update copyright headers	2015-02-11 06:49:51 +00:00
qpainter	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
qpainterpath	Fix building tests on QNX	2015-03-09 11:23:24 +00:00
qpainterpathstroker	Update copyright headers	2015-02-11 06:49:51 +00:00
qpathclipper	Update copyright headers	2015-02-11 06:49:51 +00:00
qpdfwriter	Update copyright headers	2015-02-11 06:49:51 +00:00
qpen	Update copyright headers	2015-02-11 06:49:51 +00:00
qpolygon	Update copyright headers	2015-02-11 06:49:51 +00:00
qregion	Update copyright headers	2015-02-11 06:49:51 +00:00
qtransform	Update copyright headers	2015-02-11 06:49:51 +00:00
qwmatrix	Fix build of tests on QNX.	2015-03-14 07:05:34 +00:00
painting.pro	QPdfWriter - Use QPageSize and QPageLayout	2014-03-17 13:45:52 +01:00