Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 0d2f0164f4. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8		2016-11-23 09:24:36 +01:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
idna-test.c	Updated license headers	2016-01-21 18:55:18 +00:00
qurl.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qurl_mac.mm	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qurl.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00