Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdatetime.pro | ||
| tst_qdatetime.cpp | ||
| tst_qdatetime_mac.mm | ||
Conflicts: mkspecs/features/moc.prf Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qdatetime.pro | ||
| tst_qdatetime.cpp | ||
| tst_qdatetime_mac.mm | ||