Conflicts: src/corelib/io/qstandardpaths_unix.cpp src/corelib/tools/qsharedpointer_impl.h tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp Change-Id: Iae95c5778dc091058f16f6db76f04a0178a9e809 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qsqlquery.pro | ||
| tst_qsqlquery.cpp | ||