f34e73a16a
Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb |
||
---|---|---|
.. | ||
images | ||
.gitignore | ||
qstyle.pro | ||
task_25863.png | ||
testdata.qrc | ||
tst_qstyle.cpp |