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