Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4		2016-11-16 12:35:36 +01:00
..
testdata	qmake: let discard_from() discard function definitions as well	2016-11-15 22:44:23 +00:00
.gitignore	add test for the qmake library	2015-02-25 13:54:33 +00:00
evaltest.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
parsertest.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
qmakelib.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qmakelib.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qmakelib.h	Updated license headers	2016-01-21 18:55:18 +00:00