883dfb3d15
Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit |
||
---|---|---|
.. | ||
image | ||
itemmodels | ||
kernel | ||
math3d | ||
painting | ||
qopengl | ||
qopenglconfig | ||
qvulkan | ||
text | ||
util | ||
gui.pro |