qt5base-lts/tests/benchmarks/corelib
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
..
codecs Updated license headers 2016-01-21 18:55:18 +00:00
io Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
json Updated license headers 2016-01-21 18:55:18 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
mimetypes Updated license headers 2016-01-21 18:55:18 +00:00
plugin Updated license headers 2016-01-21 18:55:18 +00:00
thread Updated license headers 2016-01-21 18:55:18 +00:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
corelib.pro test: Moving tst_QMimeDatabase::inheritsPerformance() test 2012-10-31 19:56:42 +01:00