Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qrandom.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2 |
||
|---|---|---|
| .. | ||
| images | ||
| .gitignore | ||
| qimage.pro | ||
| qimage.qrc | ||
| tst_qimage.cpp | ||
Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qrandom.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2 |
||
|---|---|---|
| .. | ||
| images | ||
| .gitignore | ||
| qimage.pro | ||
| qimage.qrc | ||
| tst_qimage.cpp | ||