summaryrefslogtreecommitdiffstats
path: root/src/bluetoothsettings/discoverymodel.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 bluetooth settingsSami Nurmenniemi2017-11-221-4/+23
|/ | | | | | | | | | | | - Hide "Scanning" text if bluetooth is powered off during scanning - Don't create duplicate entries of devices when scanning again - List devices in alphabetically sorted order - Don't initiate new scan if it's already going on Task-number: QTBUG-60084 Change-Id: I009d66694e3bcfe7419a5f5e01bfd253d7aa4cc8 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix issue when no Bluetooth device is availableTeemu Holappa2017-05-031-8/+17
| | | | | | | | | | Added async scan of the bluetooth adapter. Done some cleanup to the public class. Task-number: QTBUG-57676 Change-Id: Ia845f2f8c18fb8272160167482e5124c0b43fee7 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Replaced license headers with GPLv3Kimmo Ollila2016-06-021-20/+12
| | | | | | Change-Id: Ie355ff1e296ee48d4d66e0610e4df56640f829d4 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Migrate settings UI to use Qt Quick Controls 2Kimmo Ollila2016-03-021-1/+1
| | | | | | Task-number: QTEE-1057 Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* Refactored Qml plugins into modules.Teemu Holappa2016-02-171-0/+246
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 17:19:59 +0000