Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57		2016-06-06 09:04:55 +02:00
..
signalbug	Updated license headers	2016-01-21 18:55:18 +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.6' into 5.7	2016-06-06 09:04:55 +02:00