summaryrefslogtreecommitdiffstats
path: root/src/bluetoothsettings/bluez
Commit message (Collapse)AuthorAgeFilesLines
* Use connman with bluetooth only if networksettings are availableSami Nurmenniemi2017-12-193-3/+21
| | | | | | | Task-number: QTBUG-64693 Change-Id: Id2ce5342a0749d123a499c6c519d5ae2e6c3cae9 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2017-12-192-1/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-242-1/+8
| | | | | | | | | | | | | | 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-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | Bluetooth on/off switch now enables/disables bluetooth deviceSami Nurmenniemi2017-11-223-1/+12
| | | | | | | | | | | | | | Task-number: QTBUG-64230 Change-Id: I151933f74f459f245822a5986b009d686ce6fdfd Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Prevent bluetooth crashes for devices without bluetooth service in dbusSami Nurmenniemi2017-11-221-0/+3
|/ | | | | | | Task-number: QTBUG-63091 Change-Id: I2428e411c593783cb6142df46b863a00648b7bed 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-033-34/+235
| | | | | | | | | | 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>
* Fix qmake warningsJesus Fernandez2017-01-312-0/+15
| | | | | | | Removes some "We mean it" and "QT_BEGIN_NAMESPACE" warnings. Change-Id: Ia00b00e4e064814a1cb0dd2ca85a4bd888d58d26 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix compile error: 0 is not allowed for pointer initialization anymoreRainer Keller2016-10-311-1/+1
| | | | | | | | Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Replaced license headers with GPLv3Kimmo Ollila2016-06-023-57/+36
| | | | | | 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-3/+2
| | | | | | Task-number: QTEE-1057 Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
* Refactored Qml plugins into modules.Teemu Holappa2016-02-176-0/+272
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 19:20:32 +0000