Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5 |
||
|---|---|---|
| .. | ||
| resources | ||
| .gitignore | ||
| qfiledialog.pro | ||
| tst_qfiledialog.cpp | ||
Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5 |
||
|---|---|---|
| .. | ||
| resources | ||
| .gitignore | ||
| qfiledialog.pro | ||
| tst_qfiledialog.cpp | ||