Conflicts: configure.pri Also required s/solid\.color/solidColor/ in a couple of places in: src/gui/painting/qpaintengine_raster.cpp Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319 |
||
|---|---|---|
| .. | ||
| doc | ||
| images | ||
| main.cpp | ||
| systray.pro | ||
| systray.qrc | ||
| window.cpp | ||
| window.h | ||