Conflicts: src/gui/rhi/qshader.cpp tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5 |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| qtimezone.pro | ||
| tst_qtimezone.cpp | ||
| tst_qtimezone_darwin.mm | ||
Conflicts: src/gui/rhi/qshader.cpp tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5 |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| qtimezone.pro | ||
| tst_qtimezone.cpp | ||
| tst_qtimezone_darwin.mm | ||