e3888dd932
Conflicts: src/gui/image/qpicture.cpp Change-Id: Iecf79f96f54dc23bd703e6c4c634f909b796d7b3 |
||
---|---|---|
.. | ||
resources | ||
.gitignore | ||
qfileinfo.pro | ||
qfileinfo.qrc | ||
testdata.qrc | ||
tst_qfileinfo.cpp |
e3888dd932
Conflicts: src/gui/image/qpicture.cpp Change-Id: Iecf79f96f54dc23bd703e6c4c634f909b796d7b3 |
||
---|---|---|
.. | ||
resources | ||
.gitignore | ||
qfileinfo.pro | ||
qfileinfo.qrc | ||
testdata.qrc | ||
tst_qfileinfo.cpp |