Liang Qi bb4b86618d Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test configure src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java src/corelib/global/qglobal.cpp src/widgets/kernel/qapplication.cpp src/widgets/styles/qwindowsvistastyle.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a		2016-04-25 14:03:45 +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.6' into 5.7	2016-04-25 14:03:45 +02:00