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
..
signalbug	QtCore: Remove Windows CE.	2016-03-30 11:22:47 +00:00
test	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
.gitignore	QObject-test: Reorganize subprocess.	2011-12-14 07:07:09 +01:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qobject.pro	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tst_qobject.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00