Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a |
||
|---|---|---|
| .. | ||
| dialog.cpp | ||
| dialog.h | ||
| main.cpp | ||
| standarddialogs.pro | ||
Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a |
||
|---|---|---|
| .. | ||
| dialog.cpp | ||
| dialog.h | ||
| main.cpp | ||
| standarddialogs.pro | ||