summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Port qtdeviceutilities to use declarative typesHEADdevDan Ackers2021-06-2423-702/+274
| | | | | | Task-number: QTBUG-94426 Change-Id: I9ac17f38eccff96e25a6c1d40998b222d349274d Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* CMake: skip build on wasmSamuli Piippo2021-06-142-13/+19
| | | | | | | | ... and do some cleanup on the CMake files. Change-Id: I999a76728bb5af1f53a3bde076143febc51d4d2c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Remove dependencies from sync.profileSamuli Piippo2021-06-141-9/+0
| | | | | | | Dependencies are not used from sync.profile. Change-Id: Iaf80dc0deb0d4a1a8665bfff0ac3305318a8e38c Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Update dependenciesSamuli Piippo2021-06-141-2/+2
| | | | | Change-Id: I49413266713394924b146968e3bab869176e3485 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* CMake: Update to latest Qt CMake APISamuli Piippo2021-06-145-74/+27
| | | | | | | Task-number: QTBUG-91621 Fixes: QTBUG-94396 Change-Id: Ieaf5241eeb297a86775bb784c39217eb2b92b1b9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove all qmake filesSamuli Piippo2021-06-1412-180/+0
| | | | | | | Support builds only with CMake. Change-Id: I4b242a27d2d747ffa2d9b55a43f0d2b8f5f4cbc2 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Doc: Fix documentation build issuesTopi Reinio2021-05-054-27/+16
| | | | | | | | | | | | * Add dependency to Qt Core for the documentation build; QDoc requires Qt-specific include paths * Restore custom module header to pull in NetworkSettings include path * Restore doc.pro as it's referenced from src.pro Task-number: QTBUG-93174 Change-Id: Ie06858bd6737348a0a7711560be83eef60de3af6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Conan: Use "scm" revision mode when exporting from .git repositoryIikka Eklund2021-04-141-0/+3
| | | | | | | | | | | | | | | | | | | | | We want to match the commit ID along with the RREV (recipe revision). This way we can pin exact Conan packages to known sha1/tag which makes releasing easier. https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode We have two use cases where the conan export is being executed: - Conan export from src tar ball - .git directory is not present - Coin/CI: conan export from git repository The "scm" feature will not work if the ".git" repository does not exist. If this is the case then use the default "hash" mode for the recipe revision. Task-number: QTQAINFRA-4325 Change-Id: I5e3ac718333cd47b95d5a8886b33b1b5b7b31300 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Support Conan buildsLassi Lehikoinen2021-03-162-3/+134
| | | | | | Task-number: QTBUG-87956 Change-Id: I9ffbaa512db918d406489e5d9667c26b95c3dd54 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Enable documentation buildLassi Lehikoinen2021-03-045-18/+10
| | | | | | | | | Added a configuration flag to build the documentation. Qttools dependency is required for the QDoc for building the docs. Task-number: QTBUG-90829 Change-Id: I8dbff713184939db24f087129b3891e5a553adad Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Bump version to 6.1.0Lassi Lehikoinen2021-03-031-1/+1
| | | | | | Task-number: QTBUG-87956 Change-Id: Ifc03aeb2d3a62017e9a65d930611936012633797 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Add Coin configuration filesLassi Lehikoinen2021-02-252-0/+27
| | | | | | | Task-number: QTBUG-90849 Change-Id: Iaa934968249a440cb43fb871ac344ca55b46022b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Update documentation regarding Qt 6 changesLassi Lehikoinen2020-12-295-58/+31
| | | | | | Task-number: QTBUG-88332 Change-Id: Ie6b9310e73b5515c97c892fbc27cd89009011c98 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Modify settingsui to work against Qt 6Lassi Lehikoinen2020-12-21111-302/+102
| | | | | | | | | | | | | Following modules are removed in Qt 6 - XmlListModel - QtGraphicalEffects Adapt settingsui to work without them. Also remove needless resources and make miscallaneous improvements. Task-number: QTBUG-89065 Change-Id: Ie66d73e4d8f9c1dd4cbec2fe5f9f71f32f7d1bdf Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Build device utilities with CMake and qmake against Qt 6Lassi Lehikoinen2020-12-1626-25/+368
| | | | | | | | Also fix compiler warnings. Task-number: QTBUG-88317 Change-Id: Iff6014613a7d12426b6fe692dff0000c92930ace Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Remove all device utilities except network settingsLassi Lehikoinen2020-12-1693-7833/+2
| | | | | | | | | Also remove USB ethernet functionality from Qt Network Settings. Task-number: QTBUG-88315 Change-Id: I06c41b61854b57f57c264b3c98940333902222d2 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
* new menu item for usb ethernet protocol selectionRami Potinkara2020-07-156-81/+357
| | | | | | Task-number: QTBUG-83011 Change-Id: I8098ef26c9fa42cdf301145937eca011365d6f19 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Doc: Override generated include statementPaul Wicking2020-06-301-0/+2
| | | | | | | | | | | | Specify the containing header file with the \inheaderfile QDoc command. Pick-to: 5.15 Fixes: QTBUG-81742 Change-Id: I15421748f2b5da636e4dbf9734720d0a82ecece2 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Doc: Override generated include statementPaul Wicking2020-06-301-0/+1
| | | | | | | | | | | | Specify the containing header file with the \inheaderfile QDoc command. Pick-to: 5.15 Fixes: QTBUG-81741 Change-Id: I31b3d4b410877a0c8e28fea0603a14e0ba0148ad Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Change NTP setting synchronouslySamuli Piippo2020-05-121-1/+1
| | | | | | | | | | | | | Changing both NTP and Time may lead to error: Error org.freedesktop.timedate1.AutomaticTimeSyncEnabled: Previous request is not finished, refusing. Make sure we finish NTP request before attempting to set Time. Task-number: QTBUG-80721 Change-Id: I97c945b4ad4eeed6b077e7843ba061784592c299 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Fix time zone selectionSamuli Piippo2020-05-121-0/+1
| | | | | | | | | | Set initial index to invalid to correctly map TimeManager.timeZone to the model index, otherwize index 0 was always used for the time zone when switching views. Task-number: QTBUG-80721 Change-Id: Ia242bbde9706e8771ffa9a630fdd8e50ed7ff1e2 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Use function syntax for ConnectionSamuli Piippo2020-05-127-10/+10
| | | | | | | Implicitly defined onFoo properties in Connections are deprecated. Change-Id: I973a363437df27e0d7ad12e08991b211d62357dd Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-03-240-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9864a91c88b886ef47f1fc605cc8c74fb0138323
| * Bump version to 5.14.25.14Mikko Gronoff2020-02-241-1/+1
| | | | | | | | | | Change-Id: If238e91427a05748d2b598f6f530062018852b96 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | fix incomplete QPainterPathMikko Gronoff2020-03-121-0/+1
| | | | | | | | | | | | | | | | Fix error: aggregate 'QPainterPath path' has incomplete type and cannot be defined Change-Id: I2f169fa0a5d0def2f9cc485270905b4395738def Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Bump version to 5.15.0Mikko Gronoff2020-01-101-1/+1
| | | | | | | | | | Change-Id: Ia41d963624fd418e12bc4c6327a6ad0c0fc093ff Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-211-1/+1
|\ \ | |/ | | | | Change-Id: Ib16212eb7206a9f8829609339fd2c6410e8d02b6
| * 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>