diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-06 12:43:01 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-06 12:43:35 +0200 |
| commit | e0a8b06317bb51ca844818682ebec3cd2c2b5108 (patch) | |
| tree | 8bbdd58472a9c4304cbe7893a57492a8d980e390 /qtdeviceutilities.pro | |
| parent | d39647d3605595ba1b4ba710edea08584061e43f (diff) | |
| parent | e552d5920590673fb391288ccf20ca0030916615 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
* origin/5.9:
Fix the appearance of network settings
Doc: Bump version to 5.9.4
Conflicts:
.qmake.conf
Change-Id: I5ab18bbe6ec854060407507cad99c1f34a027b3f
Diffstat (limited to 'qtdeviceutilities.pro')
0 files changed, 0 insertions, 0 deletions