Liang Qi c2b224a758 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b		2017-07-04 16:05:53 +02: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.9' into dev	2017-07-04 16:05:53 +02:00