diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-01 15:43:05 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-01 15:44:33 +0200 |
| commit | 3728aa03ae5edffca17336be0d93db69283916f9 (patch) | |
| tree | 6630475ef9785f85ecbbdb25e47d98871e0263f3 /src/settingsui | |
| parent | 6d67c30eefc6c84de5abc1d95006b2d59cbd3d46 (diff) | |
| parent | 069c88b592fc0e76b0bea35cf256ffe4932cd76b (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
069c88b Fix manual proxy configuration on the C++ side
bbf0e42 Fix the name of the proxy URL property
Change-Id: If7521f05aac2817565b887481507ab27de09ce9c
Diffstat (limited to 'src/settingsui')
0 files changed, 0 insertions, 0 deletions