qt5base-lts/tests/auto/opengl/qgl
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
..
.gitignore Moved autotests in category 'opengl' into new directory structure 2011-09-09 10:32:38 +02:00
BLACKLIST Autotest: Enable make check on rhel 7.1 2016-02-11 05:47:38 +00:00
qgl.pro Remove insignificant flag for a platform not supported 2015-11-29 07:02:20 +00:00
qgl.qrc Moved autotests in category 'opengl' into new directory structure 2011-09-09 10:32:38 +02:00
tst_qgl.cpp Updated license headers 2016-01-21 18:55:18 +00:00