Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qfiledialog.cpp tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad		2016-09-28 11:51:35 +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-09-28 11:51:35 +02:00