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
..
qgl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
qglbuffer	Updated license headers	2016-01-21 18:55:18 +00:00
qglfunctions	Updated license headers	2016-01-21 18:55:18 +00:00
qglthreads	Updated license headers	2016-01-21 18:55:18 +00:00
opengl.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00