summaryrefslogtreecommitdiffstats
path: root/src/networksettings/qnetworksettingsservicemodel.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>
* | Update API and settings UIJuho Annunen2017-11-221-2/+2
|/ | | | | | | | | Implemented new UI design for Settings and minor changes to API Task-number: QTBUG-63091 Change-Id: Id72e20b53bc33ca0a3068d1e9b664fc5836a1cda Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Introduce a placeholder for removed wired networksVille Voutilainen2017-08-041-0/+37
| | | | | | | | | | | Disable entering the wired network settings when none have been seen. When a wired network is cable-disconnected, leave a placeholder for it. When a new wired network is cable-connected, replace the placeholder with that. Task-number: QTBUG-60979 Change-Id: I8eeb20d25d765c7bb104ad2e698e4d0686c8dc2d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix Wifi utils connection viewTeemu Holappa2016-11-041-1/+63
| | | | | | | | | Fixed the access point selection combobox to show the connected service properly. Fixed layout problems when Virtual Keyboard is active. Change-Id: Id1b05c4e12655eb93df91a78b979ad8fcf3361f5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Doc: Document QtDeviceUtilitiesTopi Reinio2016-09-061-0/+19
| | | | | | | | | | | | | | | | | | | Added documentation for the following QML modules: QtDeviceUtilities.BluetoothSettings QtDeviceUtilities.DisplaySettings QtDeviceUtilities.LocalDeviceSettings QtDeviceUtilities.LocaleSettings QtDeviceUtilities.NetworkSettings QtDeviceUtilities.TimeDateSettings QtDeviceUtilities.SettingsUI And changed the name of this documentation module to 'Qt Device Utilities'. Task-number: QTBUG-55320 Change-Id: Iee0d8467dccddc0ee75d7a395ae91f68b12ab9f2 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
* Fixes to networkSettingsService model handlingKimmo Ollila2016-06-141-2/+15
| | | | | Change-Id: Ifcea4b0111ad16f4c41692af4db04c044da8359b Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* 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/+177
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>