adc7bbe910
Conflicts: src/gui/rhi/qshader.cpp tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5 |
||
---|---|---|
.. | ||
.gitignore | ||
qtreeview.pro | ||
tst_qtreeview.cpp |
adc7bbe910
Conflicts: src/gui/rhi/qshader.cpp tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5 |
||
---|---|---|
.. | ||
.gitignore | ||
qtreeview.pro | ||
tst_qtreeview.cpp |