Conflicts: src/widgets/kernel/qshortcut.cpp tests/auto/network/access/spdy/tst_spdy.cpp Change-Id: If76c434beac2c0a393440aa365f89f77439774ce |
||
|---|---|---|
| .. | ||
| qfile_vs_qnetworkaccessmanager | ||
| qnetworkdiskcache | ||
| qnetworkreply | ||
| qnetworkreply_from_cache | ||
| access.pro | ||
Conflicts: src/widgets/kernel/qshortcut.cpp tests/auto/network/access/spdy/tst_spdy.cpp Change-Id: If76c434beac2c0a393440aa365f89f77439774ce |
||
|---|---|---|
| .. | ||
| qfile_vs_qnetworkaccessmanager | ||
| qnetworkdiskcache | ||
| qnetworkreply | ||
| qnetworkreply_from_cache | ||
| access.pro | ||