Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8		2016-05-06 15:36:44 +02:00
..
android_testdata.qrc	Android: Fix QLoggingRegistry test	2014-12-22 09:27:55 +01:00
qloggingregistry.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
qtlogging.ini	Logging: Change 'rules' section name to 'Rules'	2014-02-26 12:58:00 +01:00
tst_qloggingregistry.cpp	Updated license headers	2016-01-21 18:55:18 +00:00