Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074 |
||
|---|---|---|
| .. | ||
| qsql | ||
| qsqldatabase | ||
| qsqldriver | ||
| qsqlerror | ||
| qsqlfield | ||
| qsqlquery | ||
| qsqlrecord | ||
| qsqlresult | ||
| qsqlthread | ||
| kernel.pro | ||
Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074 |
||
|---|---|---|
| .. | ||
| qsql | ||
| qsqldatabase | ||
| qsqldriver | ||
| qsqlerror | ||
| qsqlfield | ||
| qsqlquery | ||
| qsqlrecord | ||
| qsqlresult | ||
| qsqlthread | ||
| kernel.pro | ||