summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 5.14.25.14Mikko Gronoff2020-02-241-1/+1
| | | | | Change-Id: If238e91427a05748d2b598f6f530062018852b96 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Bump version to 5.14.1Mikko Gronoff2019-12-191-1/+1
| | | | | Change-Id: I82ed9aa3353f4f54d23f38d3a111db54aeeaa149 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-050-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4088f75c91eefc0740555141d34725d84ab0b661
| * Bump version to 5.13.25.13Mikko Gronoff2019-10-311-1/+1
| | | | | | | | | | Change-Id: Iafa0da16e102651a4ae4dbee913bfa3955819f0c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Mikko Gronoff2019-10-091-1/+1
|\| | | | | | | | | | | | | | | * origin/5.13: fad870b Merge remote-tracking branch 'origin/5.12' into 5.13 39772d9 Fix static ip address showing after reconnection Change-Id: I48a3f8ef1c787c37ae9c1fa0373ef9c797fd21df
| * Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-10-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | * origin/5.12: 39772d9 Fix static ip address showing after reconnection Change-Id: I534bd8b4877893750fb902238bb8ff44394b8286
| | * Fix static ip address showing after reconnectionTeemu Holappa2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-76224 Change-Id: I2684941df342c2a9ee0439a2e13a8894dd862965 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | | Fix compiler warnings in network settingsTeemu Holappa2019-10-081-4/+3
| | | | | | | | | | | | | | | Change-Id: I4dbcb432c404bdb167a986390aa90c1092f88593 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into 5.14Mikko Gronoff2019-10-0316-2201/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/5.13: e9ac060 Merge remote-tracking branch 'origin/5.12' into 5.13 330b6f0 Drop wpa_supplicant from NetworkSettings Change-Id: Ife4f027f5ba08d03affa06b0e4cdfa26251d2580
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-10-0316-2201/+1
| |\| | | | | | | | | | | | | | | | | | | * origin/5.12: 330b6f0 Drop wpa_supplicant from NetworkSettings Change-Id: I593834799c5ca47be3bf5d37378e3ccb8a334aed
| | * Drop wpa_supplicant from NetworkSettingsAssam Boudjelthia2019-10-0216-2201/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | wpa_supplicant is broken and have not been in use for several Qt releases, thus it's being dropped. Fixes: QTBUG-78442 Change-Id: Ia3645b54b22a2959b7f65fdec10b8beaa262ea1f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-171-2/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-171-2/+1
|/| | | | |/ / | | | | | | Change-Id: If894d0aea9cde8cc591a237fb2469551664aa35a
| * | Doc: Fix documentation warningsTopi Reinio2019-09-121-2/+1
| | | | | | | | | | | | | | | | | | | | | No such QDoc command '\readwrite', plus minor language editing. Change-Id: I4b385343a51e95be42dcbf27c4b1b30793a9c6da Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Bump version to 5.14.0Mikko Gronoff2019-09-031-1/+1
|/ / | | | | | | | | Change-Id: I82151733133240f576c1a36d04d25142fabaf70b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Add unit of measurement to the display sizeSamuli Piippo2019-08-131-1/+1
| | | | | | | | | | Change-Id: If599542c4b0d5d0b1d9a3788e4468a6a5fcf68c9 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Add an example snippet to Network settings manager classTarja Sundqvist2019-08-071-1/+41
| | | | | | | | | | | | | | | | | | The NetworkSettingsManager class documentation is updated with an example code snippet. Task-number: QTBUG-76810 Change-Id: Ic02109332281357c941dec77fe2995988cbc9359 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-032-9/+7
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-032-9/+7
|/| | | |/ | | | | Change-Id: I040ffc2c6edfb8115aa43da738e326a758117cc8
| * Set service type to NetworkSettingsType.Wired in onServiceChangedAssam Boudjelthia2019-07-301-2/+3
| | | | | | | | | | | | | | | | | | | | In WiredSettings.qml, onServiceChanged was being executed over and over while the correct service type was not being set before that. Fixes: QTBUG-71341 Change-Id: I15a097fbb14acfb4ab18ff3541689e296f3ea84c Reviewed-by: Jani Launonen <jani.launonen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Remove duplicate nested isValid() conditionAssam Boudjelthia2019-07-301-7/+4
| | | | | | | | | | | | | | | | | | The if condition is duplicated in QNetworkSettingsServiceFilter::filterAcceptsRow() Change-Id: Ie93044cc11421c4a6247cc2e511c04036b2f625b Reviewed-by: Jani Launonen <jani.launonen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-273-1/+50
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-273-1/+50
|/| | | |/ | | | | Change-Id: Ieccf7c09a854bd3b84dd5c7d0fe97df867da7ea5
| * Add missing settings properties of viewSettings and appFontAssam Boudjelthia2019-07-243-1/+50
| | | | | | | | | | | | | | | | | | Those properties make SettingsUI dependent on qtlauncher, thus the need to add the necessary values here. Fixes: QTBUG-68987 Change-Id: I8d194317af341048a5b3607e8b796947fb60bff6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I21c07f00492e8f41860b870bdec48ddceeb1c9fd
| * Doc: Bump version to 5.12.5Mikko Gronoff2019-06-201-1/+1
| | | | | | | | | | Change-Id: I3f2f50a0d5f7ff2c52acc2e01fbcba71edb4a21a Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | Doc: Bump version to 5.13.1Mikko Gronoff2019-06-241-1/+1
| | | | | | | | | | Change-Id: If04e6b1a1388d353f85156a745ed7e5d19d5afb3 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | Implement network auto connection propertyKari Hormi2019-06-204-9/+33
| | | | | | | | | | | | Task-number: QTBUG-76537 Change-Id: I9388854a65706c643de2f184e6e680458af7bc1e Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Implement setAutoConnect() functionKari Hormi2019-06-194-3/+16
| | | | | | | | | | | | | | | | | | | | This commit strictly implements the setAutoConnect function, but does not provide anything else. AutoConnect status query should still be implemented. Task-number: QTBUG-75729 Change-Id: I73e7ba9efe7c4efe6e46810c3efe054473f0a7e2 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Mikko Gronoff2019-06-031-0/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-06-031-0/+1
|/| | | |/ | | | | | | | | | | | | | | | | | | * origin/5.12: f6e140a Skip build without QtQuick a8483ed Doc: Bump version to 5.12.4 Conflicts: .qmake.conf Change-Id: I21da08f549f503e45ce6b2ada8afa52ec4e2e2dc
| * Skip build without QtQuickSamuli Piippo2019-05-311-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-76139 Change-Id: I41759ee26c9dbb83a4b1af1c110d23f826fb7681 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * Doc: Bump version to 5.12.4Mikko Gronoff2019-05-311-1/+1
| | | | | | | | | | | | Change-Id: Ic1cc93b01fdcc3132a0120a9cf8c34fbc243339d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-04-2526-134/+325
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/5.12: 12341e3 Doc: Bump version to 5.12.3 f73704b Fix documentation build warning fb3675a Fix the list of linked Device Utilities modules Conflicts: .qmake.conf Change-Id: Ida487c8a9f6e405f3593bc351f7cd960ffd12b1f
| * Doc: Bump version to 5.12.3Mikko Gronoff2019-03-251-1/+1
| | | | | | | | | | | | Change-Id: I87baaa5c0ae65449a681b842307e4a01f538d47d Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * Fix documentation build warningTarja Sundqvist2019-03-203-3/+51
| | | | | | | | | | | | | | | | Some build warnings fixed. The documentation was built with Qt 5.9. Change-Id: I8f988c1267a6a6ed925cfac1f0cd40547ffc8160 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * Fix the list of linked Device Utilities modulesTarja Sundqvist2019-03-1826-131/+274
| | | | | | | | | | | | | | | | | | | | | | All Device Utilities modules are listed in the main page. Also All C++ classes / All QML Types pages added. Task-number: QTBUG-74231 Change-Id: Ia6b091e6d136b844c36de94f8fafa0bb7b199777 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Mikko Gronoff2019-02-062-0/+2
|\| | | | | | | | | | | | | | | * origin/5.12: 090f17a Doc: Bump version to 5.12.2 76ab4f6 Enable boot2qt launcher automatic demo mode Change-Id: I6eb8fb9cb56b3d01e3f88a636ebd7ba9e6b16a47
| * Doc: Bump version to 5.12.2Mikko Gronoff2019-02-061-1/+1
| | | | | | | | | | Change-Id: Ib1832933eef515c4ffe3193619c2d79a1e7aca6f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Enable boot2qt launcher automatic demo modeSami Nurmenniemi2019-02-042-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-72852 Change-Id: I0e134e76721e73721a8318534bbaa12d68c92ca7 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Doc: Bump version to 5.13.0Mikko Gronoff2019-02-041-1/+1
|/ | | | | Change-Id: Ie16b1fd1d9de3d14a0d2a94d15a23d213440a30d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Doc: Bump version to 5.12.1Mikko Gronoff2018-12-101-1/+1
| | | | | Change-Id: I534d56fa0c1727618918646124d74ce07ae708ed Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Mikko Gronoff2018-12-100-0/+0
|\ | | | | | | | | | | | | | | | | | | * origin/5.11: 28c7395 Doc: Bump version to 5.11.3 Conflicts: .qmake.conf Change-Id: I8f8ebd9ed573e3f54d6f3f3c2e9c3ef590ca00fb
| * Doc: Bump version to 5.11.35.11Mikko Gronoff2018-11-271-1/+1
| | | | | | | | | | Change-Id: I756045e5c929be0864a76bf8cf00739b86735c7d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Doc: Fix help contents in Qt CreatorLeena Miettinen2018-12-101-9/+9
| | | | | | | | | | | | | | | | | | The QML Types and Examples links were missing in the Contents view in the Qt Creator Help mode. Change-Id: Ib0555364f19c2e859d5da9f80fa22b2d932c8d92 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Display: fix padding on the TextFieldsSamuli Piippo2018-11-271-0/+8
| | | | | | | | | | | | | | | | Without the padding, the text was partially covered by the background rectangle. Change-Id: Ic5f6d60a5ff1256f89a911edf41a831e3d53a793 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Update RegionSelect filter box appearanceSamuli Piippo2018-11-121-2/+6
| | | | | | | | | | | | | | | | | | Make the text field appear more like the guidelines suggests. Without the padding, the text was partially covered by the background rectangle. Change-Id: Iece9990b2f8caa36bd947157ba8314a08aea3592 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Fix combobox selection areaSamuli Piippo2018-11-122-12/+11
| | | | | | | | | | | | | | | | | | Extend the touch area to cover whole compobox width. Also with QTBUG-49224 now fixed, previous workaround can be removed. Change-Id: Iabf784ec91fac839da19a3615a6977a99e532a40 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | wifi: enable manual connect only when wifi is enabledSamuli Piippo2018-11-081-0/+6
| | | | | | | | | | | | | | | | | | Gray out and disable manual wifi connect and disconnect buttons when wifi is not enabled. Enable disconnect button only when connected to a wifi. Change-Id: I275d3660f20689bb25dc477211a3540df073c270 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>