Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qmap.pro | ||
| tst_qmap.cpp | ||
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qmap.pro | ||
| tst_qmap.cpp | ||