qt5base-lts/tests/auto/corelib/io/qdir
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
entrylist Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
resources/entryList Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
searchdir Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testData Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testdir Update copyright headers 2015-02-11 06:49:51 +00:00
types Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
android_testdata.qrc Android: Fix QDir tests 2014-12-22 09:26:49 +01:00
qdir.pro Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qdir.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qdir.cpp Make QDir::relativeFilePath() return "." for a path to itself. 2015-06-24 15:43:58 +00:00