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
..
arch	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
common	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
mac/corewlan	Updated license headers	2016-01-15 12:25:24 +00:00
qpa	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
unix	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
win/directwrite	Updated license headers	2016-01-15 12:25:24 +00:00
x11	Updated license headers	2016-01-15 12:25:24 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00