Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
q_func_info	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qflags	Use Q_DECL_RELAXED_CONSTEXPR in QFlags	2014-10-31 09:54:15 +01:00
qgetputenv	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qglobal	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qglobalstatic	Fix Q_GLOBAL_STATIC support for exceptions	2013-02-28 23:43:46 +01:00
qhooks	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qlogging	Fix the %{time} printing to *not* default to the process's time	2014-11-21 16:47:35 +01:00
qnumeric	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qrand	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtendian	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
global.pro	Add a more reliable replacement for qt_add/removeObject().	2014-04-15 17:50:20 +02:00