qt5base-lts/tests/auto/corelib/io/qurl
Liang Qi b48a13fd68 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	examples/examples.pro
	tests/auto/corelib/tools/qchar/tst_qchar.cpp
	tests/auto/other/qaccessibility/accessiblewidgets.h

Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
2017-03-28 09:28:31 +02:00
..
.gitignore
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-03-28 09:28:31 +02:00