qt5base-lts/tests/auto/corelib/io/qabstractfileengine
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
..
resources Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
qabstractfileengine.pro Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qabstractfileengine.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qabstractfileengine.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00