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
..
qfiledialog2.pro	Enable tst_qfiledialog2 on OSX	2014-11-19 16:13:25 +01:00
tst_qfiledialog2.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00