qt5base-lts/tests/auto/corelib/io/qurl
Frederik Gladhorn c608ec8254 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/corelib/io/qsavefile_p.h
	src/corelib/tools/qregularexpression.cpp
	src/gui/util/qvalidator.cpp
	src/gui/util/qvalidator.h

Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
2013-01-22 18:40:13 +01: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 QUrl: port thread-safety autotest from Qt4. 2012-08-26 11:08:42 +02:00
tst_qurl.cpp Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00