Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +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	tst_qlogging: add tests for %{pid} and %{threadid}	2014-12-19 01:54:41 +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