AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
511790fd1a
qt5base-lts/tests/auto/corelib/io/qdir
History
Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	config_help.txt
	configure
	mkspecs/features/uikit/sdk.prf
	src/corelib/global/qhooks.cpp
	src/corelib/io/qfilesystemwatcher.cpp
	src/corelib/io/qlockfile_unix.cpp
	src/corelib/tools/qalgorithms.h
	src/gui/kernel/qwindowsysteminterface.h
	src/gui/text/qtextdocument_p.cpp
	src/network/access/access.pri
	src/network/access/qnetworkaccessmanager.cpp
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/src.pro
	src/testlib/qtestcase.cpp
	src/widgets/kernel/qwidgetbackingstore_p.h
	src/widgets/styles/qwindowscestyle.cpp
	src/widgets/styles/qwindowsmobilestyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
2016-06-13 12:46:46 +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 Updated license headers 2016-01-21 18:55:18 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qdir.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qdir.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00