Conflicts: tests/auto/network/kernel/qnetworkinterface/BLACKLIST Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qsqlquery.pro | ||
| tst_qsqlquery.cpp | ||
Conflicts: tests/auto/network/kernel/qnetworkinterface/BLACKLIST Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qsqlquery.pro | ||
| tst_qsqlquery.cpp | ||