Conflicts: mkspecs/features/qt_common.prf src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8 |
||
|---|---|---|
| .. | ||
| resources | ||
| .gitignore | ||
| qfiledialog.pro | ||
| tst_qfiledialog.cpp | ||
Conflicts: mkspecs/features/qt_common.prf src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8 |
||
|---|---|---|
| .. | ||
| resources | ||
| .gitignore | ||
| qfiledialog.pro | ||
| tst_qfiledialog.cpp | ||