Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qrandom.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2 |
||
|---|---|---|
| .. | ||
| qmacstyle | ||
| qstyle | ||
| qstyleoption | ||
| qstylesheetstyle | ||
| styles.pro | ||
Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qrandom.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2 |
||
|---|---|---|
| .. | ||
| qmacstyle | ||
| qstyle | ||
| qstyleoption | ||
| qstylesheetstyle | ||
| styles.pro | ||