Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495		2015-12-18 08:37:31 +01:00
..
signalbug	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +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 dev	2015-10-14 15:45:35 +02:00