Conflicts: src/plugins/sqldrivers/psql/qsql_psql.cpp Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| thread | ||
| tools | ||
| corelib.pro | ||
Conflicts: src/plugins/sqldrivers/psql/qsql_psql.cpp Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| thread | ||
| tools | ||
| corelib.pro | ||