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
..
desktopsettingsaware	Update copyright headers	2015-02-11 06:49:51 +00:00
modal	Update copyright headers	2015-02-11 06:49:51 +00:00
test	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tmp	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
heart.svg	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qapplication.pro	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tst_qapplication.cpp	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00