Conflicts: src/corelib/io/qstandardpaths_win.cpp src/plugins/platforms/ios/qioswindow.mm src/plugins/platforms/ios/quiview.mm tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I5deb0a0176a454a9c566e924d074ba60ce04f0bc |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| BLACKLIST | ||
| qthreadpool.pro | ||
| tst_qthreadpool.cpp | ||