diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:18:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:18:05 +0200 |
| commit | 23a36fd2bfcdb57849deaa1e10e6e3f7b1156ed8 (patch) | |
| tree | b527c7e3ba4a831b542b0bccfb6a5a748a8a4fd9 /tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro | |
| parent | c003a18ee332abf2387172eb0856a176a32a6c8f (diff) | |
| parent | 072f5b513e486e884ea7fa4a1cac9aedf3846374 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/io/qprocess_win.cpp
src/widgets/itemviews/qheaderview.cpp
Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761
Diffstat (limited to 'tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro')
0 files changed, 0 insertions, 0 deletions