Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 018e670a26. The change was introduced in 5.6. After the refactoring, 14960f52, in 5.7 branch and a merge, it is not needed any more. Conflicts: .qmake.conf src/corelib/io/qstandardpaths_mac.mm src/corelib/tools/qsharedpointer_impl.h tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4		2016-02-18 20:50:35 +01:00
..
animation	Updated license headers	2016-01-21 18:55:18 +00:00
codecs	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
global	Add qOverload to select overloaded functions	2016-02-15 12:33:24 +00:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
json	Update testdata	2016-02-17 04:50:50 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
mimetypes	Updated license headers	2016-01-21 18:55:18 +00:00
plugin	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
statemachine	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
thread	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
tools	Introduce QHash::equal_range()	2016-02-14 06:43:52 +00:00
xml	Updated license headers	2016-01-21 18:55:18 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00