diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 15:07:42 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 15:08:26 +0300 |
| commit | 9ad08f17c3cd96bb6b9d5d501870cb3987ed9097 (patch) | |
| tree | e84ab2f923e202f3021e8a9f4d227fef195dfaf9 /src/networksettings/connman/qnetworksettingsmanager_p.cpp | |
| parent | 59405866644db41b866bdb561fe8ad2a1892f73b (diff) | |
| parent | 261e4c619214af5e5cf95ec08a7d46d702ae0a93 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
261e4c6 Doc: Add documentation for C++ classes
0ecd391 Fix ip address tracking and display
Commit 0ecd391 originally cherry-picked from 5.12 branch, hence
few bogus conflicts in qnetworksettingsmanager.cpp.
Conflicts:
src/networksettings/qnetworksettingsinterfacemodel.cpp
src/networksettings/qnetworksettingsmanager.cpp
Change-Id: Ib8007ffc55ba935da42209303f637b51bad3ab1d
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.cpp')
0 files changed, 0 insertions, 0 deletions