Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6 |
||
|---|---|---|
| .. | ||
| events | ||
| qcoreapplication | ||
| qmetaobject | ||
| qmetatype | ||
| qobject | ||
| qtimer_vs_qmetaobject | ||
| qvariant | ||
| kernel.pro | ||
Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6 |
||
|---|---|---|
| .. | ||
| events | ||
| qcoreapplication | ||
| qmetaobject | ||
| qmetatype | ||
| qobject | ||
| qtimer_vs_qmetaobject | ||
| qvariant | ||
| kernel.pro | ||