Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
|---|---|---|
| .. | ||
| codecs | ||
| io | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
|---|---|---|
| .. | ||
| codecs | ||
| io | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||