Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
q_func_info	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qflags	tst_QFlags: make constExpr() check compile on clang trunk	2013-11-07 03:06:29 +01:00
qgetputenv	Add qunsetenv(), next to qputenv() and friends.	2013-02-07 01:22:40 +01:00
qglobal	support c'tor as second parameter in foreach macro	2014-02-11 13:28:35 +01:00
qglobalstatic	Fix Q_GLOBAL_STATIC support for exceptions	2013-02-28 23:43:46 +01:00
qlogging	Remove trailing space from QDebug stream	2013-12-06 13:33:10 +01:00
qnumeric	Say hello to qFloatDistance()	2013-09-27 07:57:23 +02:00
qrand	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qtendian	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
global.pro	Enable QGlobalStatic autotest.	2013-02-28 23:43:50 +01:00