Frederik Gladhorn abd3b8030c Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/widgets/kernel/qwidget_qpa.cpp src/widgets/widgets.pro Change-Id: I697eec936c4e1a6c360edc8f0b472e23c0461ecb		2014-07-22 20:21:19 +02:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
idna-test.c	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurl.pro	Add Mac type conversion functions to QtCore	2013-09-21 05:09:41 +02:00
tst_qurl_mac.mm	Add Mac type conversion functions to QtCore	2013-09-21 05:09:41 +02:00
tst_qurl.cpp	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-22 20:21:19 +02:00