diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-28 11:38:59 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-28 11:39:50 +0300 |
| commit | 010ca29d1eb902906b0005df7fb853dade60c778 (patch) | |
| tree | 8ba6f4776c83490a939112817f07b940f3a048c2 /src/settingsui | |
| parent | ed38e9210f8408ec38502e0311e944915617e7c4 (diff) | |
| parent | 27ac1af572dc9b17d4283b225b6c73b13f758546 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
27ac1af Add missing powered property to NetworkInterface
041e4ef Remove extra servicesChanged signal emit
Change-Id: I457b71cf61195f52283109e5b0970b9f3839d437
Diffstat (limited to 'src/settingsui')
0 files changed, 0 insertions, 0 deletions