Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a |
||
|---|---|---|
| .. | ||
| qsql | ||
| qsqldatabase | ||
| qsqldriver | ||
| qsqlerror | ||
| qsqlfield | ||
| qsqlquery | ||
| qsqlrecord | ||
| qsqlresult | ||
| qsqlthread | ||
| CMakeLists.txt | ||
| kernel.pro | ||
Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a |
||
|---|---|---|
| .. | ||
| qsql | ||
| qsqldatabase | ||
| qsqldriver | ||
| qsqlerror | ||
| qsqlfield | ||
| qsqlquery | ||
| qsqlrecord | ||
| qsqlresult | ||
| qsqlthread | ||
| CMakeLists.txt | ||
| kernel.pro | ||