a15c3d086d
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 |
||
---|---|---|
.. | ||
resources | ||
qabstractfileengine.pro | ||
qabstractfileengine.qrc | ||
tst_qabstractfileengine.cpp |