Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
q_func_info	Update copyright headers	2015-02-11 06:49:51 +00:00
qflags	Update copyright headers	2015-02-11 06:49:51 +00:00
qgetputenv	QtCore: assorted migrations to QString::asprintf	2015-02-12 19:40:04 +00:00
qglobal	Update copyright headers	2015-02-11 06:49:51 +00:00
qglobalstatic	Fix tst_qglobalstatic on OS X	2015-06-04 05:56:16 +00:00
qhooks	Update copyright headers	2015-02-11 06:49:51 +00:00
qlogging	Update copyright headers	2015-02-11 06:49:51 +00:00
qnumeric	Autotest: make the test pass with the Intel compiler	2015-06-19 23:22:34 +00:00
qrand	Update copyright headers	2015-02-11 06:49:51 +00:00
qtendian	Update copyright headers	2015-02-11 06:49:51 +00:00
global.pro	Add a more reliable replacement for qt_add/removeObject().	2014-04-15 17:50:20 +02:00