summaryrefslogtreecommitdiffstats
path: root/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2017-12-191-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: Merge remote-tracking branch 'origin/5.9' into 5.10 Fix compilation with namespaces Import only available modules Update license headers Verify that Qtdbus module is available tests: add tests.pro for CI Doc: Bump version to 5.9.3 Conflicts: src/bluetoothsettings/discoverymodel.cpp src/localesettings/localefiltermodel.cpp src/localesettings/localemodel.cpp src/timedatesettings/timezonefiltermodel.cpp Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
| * Fix compilation with namespacesSami Nurmenniemi2017-11-241-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Fix cancel button on WiFi passphrase screenSami Nurmenniemi2017-11-221-4/+16
|/ | | | | | | Task-number: QTBUG-64230 Change-Id: I3859293f2d9422be9a253143544470f39be937ea Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Don't give connman user name as a network nameKari Oikarinen2017-04-101-5/+2
| | | | | | | | | | Don't give the network name as all, since it is not required for visible networks. Also adjust the API to remove the user name parameter that was never used (correctly). Task-number: QTBUG-57249 Change-Id: I0eb75db6eebcaa05661a9404b728ab8af831cf1d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Replaced license headers with GPLv3Kimmo Ollila2016-06-021-18/+11
| | | | | | Change-Id: Ie355ff1e296ee48d4d66e0610e4df56640f829d4 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Refactored Qml plugins into modules.Teemu Holappa2016-02-171-0/+101
Separated C++ and Qml interfaces. All the UI's from plugins are moved to the settingsui folder. Change-Id: Id6a6623346b18321357bc42d24121c4d9cdfd098 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>