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
..
testdata	qmake: teach findMocs to handle backslash-newline gracefully.	2015-12-17 13:47:33 +00:00
.gitignore	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
qmake.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
testcompiler.cpp	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
testcompiler.h	Update copyright headers	2015-02-11 06:49:51 +00:00
tst_qmake.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00