Conflicts: src/corelib/thread/qsemaphore.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707 |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| doc | ||
| kernel | ||
| socket | ||
| ssl | ||
| configure.json | ||
| configure.pri | ||
| network.pro | ||