Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/dbus/qdbusconnection_p.h src/dbus/qdbusintegrator.cpp src/dbus/qdbusintegrator_p.h tests/auto/corelib/io/qdir/qdir.pro tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc		2016-01-26 16:27:28 +01:00
..
android_testdata.qrc	Android: Fix QLoggingRegistry test	2014-12-22 09:27:55 +01:00
qloggingregistry.pro	winrt: msvc2015: refactor file handling	2016-01-21 05:53:17 +00: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