a503bf5470
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
---|---|---|
.. | ||
qbrush | ||
qcolor | ||
qcolorspace | ||
qpagelayout | ||
qpagesize | ||
qpaintengine | ||
qpainter | ||
qpainterpath | ||
qpainterpathstroker | ||
qpathclipper | ||
qpdfwriter | ||
qpen | ||
qpolygon | ||
qregion | ||
qtransform | ||
qwmatrix | ||
painting.pro |