Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6 |
||
|---|---|---|
| .. | ||
| main.cpp | ||
| outofline.cpp | ||
| qrawvector.h | ||
| qvector.pro | ||
Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6 |
||
|---|---|---|
| .. | ||
| main.cpp | ||
| outofline.cpp | ||
| qrawvector.h | ||
| qvector.pro | ||