summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Forward-port the improvement in passphrase error handlingVille Voutilainen2018-03-285-0/+25
| | | | | | Task-number: QTBUG-66280 Change-Id: I1c26e19907be99119bf9409c7269471c15b57bf8 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Doc: Bump version to 5.11.0Mikko Gronoff2018-02-191-1/+1
| | | | | | | | Task-number: QTBUG-66307 Change-Id: I1e45dc16205b82065ff85c29544384635bc479ed Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devMikko Gronoff2018-02-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.10: Merge remote-tracking branch 'origin/5.9' into 5.10 Fix the appearance of network settings Doc: Bump version to 5.10.1 Doc: Bump version to 5.9.4 Conflicts: src/settingsui/network/NetworkSettings.qml Change-Id: I1d65634b3180762bc386d36d222e94372fb418d4
| * Merge remote-tracking branch 'origin/5.9' into 5.105.10Mikko Gronoff2018-02-061-20/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.9: Fix the appearance of network settings Doc: Bump version to 5.9.4 Conflicts: .qmake.conf Change-Id: I5ab18bbe6ec854060407507cad99c1f34a027b3f
| | * Fix the appearance of network settingsVille Voutilainen2018-01-311-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The radiobutton now seems to draw the indicator, even though it didn't do that before. Also, the texts in the buttons were not laid out properly. The image element was a remnant from earlier versions, so this simplifies the UI as well. Change-Id: I4c6238ae9b2d6011ea86c22ecd118e1b72638b00 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * Doc: Bump version to 5.9.4Mikko Gronoff2017-12-141-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib74412bba5540b151365ec1c9320cf0fded96041 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | Doc: Bump version to 5.10.1Mikko Gronoff2017-12-281-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibb544c43bb5e78f46a85237ae04319384584b14d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | 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-1965-103/+393
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Mikko Gronoff2017-12-0465-102/+391
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/5.9: 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: .qmake.conf Change-Id: I83f4f8a507586d50423d0a2bb1dd4b69557b38ed
| | * Fix compilation with namespacesSami Nurmenniemi2017-11-2454-25/+232
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * Import only available modulesSami Nurmenniemi2017-11-241-5/+6
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: I7b86e45f748ddb267c70ffa81948ccaeedb64b7f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * Update license headersSami Nurmenniemi2017-11-248-68/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation files now use qtbase/header.FDL and scripts qtbase/header.GPL licenses. Task-number: QTBUG-64693 Change-Id: I2c0f6fe8ece7434f9dc68c1a185532ae6eb023fa Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * Verify that Qtdbus module is availableSamuli Piippo2017-11-241-4/+7
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: I7660016274bf177c2be4c119cd17d3ccf2352167 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * tests: add tests.pro for CISamuli Piippo2017-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64693 Change-Id: Ib01144f14d6d384f5f956a071dabce8382e2b358 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| | * Doc: Bump version to 5.9.3Mikko Gronoff2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib702a94baa98ea3f73a5a8d51160a1beeb61e9e4 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | Don't start scanning if interface is not poweredSami Nurmenniemi2017-11-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes "no carrier" prints when opening settings menu Task-number: QTBUG-64230 Change-Id: Ic01b50cfa5d337a66d064babca9e2aa4e9f87a00 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix bluetooth settingsSami Nurmenniemi2017-11-224-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 errors from region select viewSami Nurmenniemi2017-11-221-7/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60082 Change-Id: If943bc6dcc2a095b32a77dfca3f1d6166219008c Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix manual date & time settingSami Nurmenniemi2017-11-222-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set button now returns back to general date & time settings - Manual date initial values are taken from current date - Cleaned up error prints Task-number: QTBUG-60082 Change-Id: I2787c41378a1534cf96a4ef60910a3fc2a45c24e Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | More user friendly handling of WiFi passphraseSami Nurmenniemi2017-11-225-62/+108
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64230 Change-Id: I9de0f5668b419e322a3b0466f2e30a6f957e617e Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix cancel button on WiFi passphrase screenSami Nurmenniemi2017-11-223-99/+55
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64230 Change-Id: I3859293f2d9422be9a253143544470f39be937ea 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-226-2/+16
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64230 Change-Id: I151933f74f459f245822a5986b009d686ce6fdfd Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Add Wi-Fi enable button to network settingsSami Nurmenniemi2017-11-229-12/+126
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64230 Change-Id: I2aad07fb98a45997b116fc9a06924ba8be3dff2a Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix random crashes due to missing importSami Nurmenniemi2017-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: Ic85db742b782e66bae843e5f039c82d46e6aca24 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Move theme color definitions to one placeSami Nurmenniemi2017-11-2212-41/+41
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60084 Change-Id: Ie80c9ebc26bd7925c7f0f67404878818675c0f06 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Unify primary button appearanceSami Nurmenniemi2017-11-2210-18/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60083 Change-Id: Ic432b63d5321a11ae6dbb15e99d159a62eab2eb7 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix border image drawing for corner cut buttonsSami Nurmenniemi2017-11-222-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three corrections: - Previously border was drawn along the border of the rectangle. This caused half of the pen to remain outside of the rectangle and border looked strange. - The default border width should be 2 - Pressed button should show darker screen borders Task-number: QTBUG-60083 Change-Id: I1677a252bd3fd14b69389bfa568787a1e8c15676 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-222-0/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I2428e411c593783cb6142df46b863a00648b7bed Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Disable usage of LocaleManager.localeSami Nurmenniemi2017-11-223-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It uses dbus for querying from a service that might not exist. If that is the case, ui hangs for 20s. See QTBUG-63598. Task-number: QTBUG-63091 Change-Id: I4b8a8355d7e4fcbd943e87277ffea412510f3926 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix locale settings uiSami Nurmenniemi2017-11-223-83/+36
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I6847d4e6e29c712ae3051924fd8c3f1364675fe8 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix CustomComboBoxSami Nurmenniemi2017-11-223-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not possible to calculate popup height from the ComboBox y coordinate, it does not work with columns and rows. Height must be set by the user of the component who can calculate it correctly. Added itemsVisible property for quick height selection. Task-number: QTBUG-63091 Change-Id: I3f1a86545b7df58f453b98ce2e1f3a7bce9cc732 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix date & time setting screensSami Nurmenniemi2017-11-224-383/+269
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: Id2dbd54f74bcf7fed0577e7ad3dadce1e2748f78 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Unify fonts and layouts between settings pagesSami Nurmenniemi2017-11-223-10/+29
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I2d4741f1d0ff23cb26a2cce7593c4fc7f5f8ec16 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Improve network settingsSami Nurmenniemi2017-11-222-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dynamically opening details, they don't work with several "Wired" networks. Task-number: QTBUG-63091 Change-Id: I740c7ef3ef3c367892a4534ff3bb4cb05c06f29a Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix power menu button widthsSami Nurmenniemi2017-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I2b6fc64b625e46a8a4c7cd4a194ddc087428ccee Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Fix display settings layoutSami Nurmenniemi2017-11-222-75/+70
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I7dcde1e2ac0e20edddf54c8a7f3d7cd049ead39b Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Move QtButtonImageProvider from QtLauncherDemo to QtDeviceUtilitiesSami Nurmenniemi2017-11-2219-12/+261
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I54211671174bc04cb07302e0b6001dca2f29d5d4 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Settings-plugin updateLasse Räihä2017-11-2214-554/+608
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63091 Change-Id: I116e768704f61c54d393ff00416ef03cc1885c0b Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | | Update API and settings UIJuho Annunen2017-11-2256-559/+2293
|/ / | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Mikko Gronoff2017-09-144-2/+109
|\ \ | |/ | | | | | | | | | | * origin/5.9: Add a wifi-example Change-Id: I84d76aac0320efa46b2146206c5011400a601d28
| * Add a wifi exampleVille Voutilainen2017-09-074-2/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The WiFi tutorial linked to NetworkSettings module and NetworkSettingsManager QML type. Added a section Tutorial and Example Code to a module reference page. It contains a link to WiFi tutorial and provides the Settings UI Git repository as an additional example code for Qt Device Utilities. Task-number: QTBUG-56694 Change-Id: Ib6c6a446fd36530525d521e5d568ec154d58a63d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Doc: Bump version to 5.10.0Mikko Gronoff2017-09-011-1/+1
|/ | | | | Change-Id: I2c9b00625fff60ac196fe4eff343d698fb06bfbd Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Doc: Bump version to 5.9.2Mikko Gronoff2017-08-251-1/+1
| | | | | | Change-Id: Ibfc5cf682885aa2f0b7ccad20f21752efc91f608 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Introduce a placeholder for removed wired networksVille Voutilainen2017-08-049-1/+85
| | | | | | | | | | | 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>
* Display the current IP address for a wifi connectionVille Voutilainen2017-07-051-7/+14
| | | | | | | Task-number: QTBUG-60979 Change-Id: I0057aa65c4787c9eb59da67cb36590faf7aa33fe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* Set the method indexes for the comboboxes at a more suitable timeVille Voutilainen2017-07-041-3/+6
| | | | | | | | | | Setting the indexes in Component.onCompleted seems to happen too early. The service doesn't seem to be ready at that point. Hooking to the onServiceChanged signal and setting the indexes there works better. Task-number: QTBUG-60979 Change-Id: Idda882222662415367cd92122e7ed983e1bd9c4b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Allow editing ipv4 settings in manual mode directly after savingVille Voutilainen2017-07-041-44/+55
| | | | | | | Task-number: QTBUG-60979 Change-Id: I9f2c2eddc50cfae2130dea4ec51360312ea343e5 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use both IPv4.Configuration and IPv4 for reading connman settingsVille Voutilainen2017-06-291-3/+12
| | | | | | Task-number: QTBUG-60979 Change-Id: Iac5659897391f2517704a8347c7ef8a77a6000e7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Doc: Bump version to 5.9.1Topi Reinio2017-06-203-8/+9
| | | | | | | | | | | | | | | | Do this by making the main module version in .qmake.conf follow the corresponding Qt for Device Creation versioning. This allows $QT_VERSION et al. to be used in the doc configuration. Make the full version visible in documentation, to help distinguish between installed documentation sets with identical major/minor versions but different patch version. After this change, simply updating .qmake.conf is sufficient for subsequent version increments. Change-Id: Ib0a1ecb5a44d9f2530fa2df3b8daf7b3e541f884 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>