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
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-08-26 20:06:57 +02:00
src	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00