summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7ad9a72313df6e28511a6cbe4c5f58f1d456869d
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibe52f5ab836e60fce63eabaf94500baa8b645476
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iea938b238f2e6d1bdd22b195f5e78dc3e413c985
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I58d4cae9eba08e2c85d5eece569c462f89f2a5e2
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I60829c25bf0caf7c16a5ad963b70565b1345868e
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-182-2/+2
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I5f83f5717ca13a8f8f282079170ab4c34804c3f4
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I74de151d01657170ce90e9f388c59cb3f535aaf2
| * Fix warning with QML FileDialog with many filesJoni Poikelin2021-05-031-1/+1
| | | | | | | | | | | | | | Fixes: QTBUG-92444 Change-Id: I3920fa1da087752049b5c83b23995b2e88e3ca96 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I58b787a5fd82f919e9d19a29397e574c321aa152
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Id0152673e04ef846e259d75ba386dcdf9d1b55a0
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-23404-8425/+8425
|/ | | | | | | | | | | This reverts commit 345343b7830cd9ccf03ccbe435cdaee13ba8d0fc. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ib1f8762037141b0c9fca42a8e1b9e1bf4585a110 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-02404-8425/+8425
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtquickcontrols. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4215 Change-Id: Id7a83ea4b83801352f9d45eaa688777add6784ab Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* ColorDialog: Set the options before the current color on the helperAndy Shaw2021-01-273-1/+82
| | | | | | | | | By setting the options first before the current color, we ensure it does not crash on some platform helpers which expect the options to be available already. Change-Id: I75d8e556779d23c12a0f036689bb0bf3f36a8538 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* [Android] Fix CheckBox rtl issuesAndy Shaw2021-01-201-0/+1
| | | | | | | | | * Fix rtl issues as on the FontDialog * Fixed rtl issues of the CheckBox Fixes: QTBUG-62240 Change-Id: I72a4fa8cae88d18aef779a85e848a06fe1cd9965 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* [Android] Fix FontDialog layout issuesPekka Gehör2021-01-201-10/+49
| | | | | | | | | | | | | * Adjusted widths of TableViews to fit an Android layout * Adjusted height of the Dialog to fit an Android layout on Portrait mode * Fixed binding loop between the content and the mainLayout items * Fixes will not affect to the desktop version Fixes: QTBUG-62239 Change-Id: I03794eeaec9d09a62fd42b7f4c1b6a9d14fbd93b Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Convert the path to a url correctlyAndy Shaw2020-11-101-1/+1
| | | | | | | | | Just adding file:// is not enough if it is a Windows file path as it will cause it to lose the drive information as a result. So use the function available to get this correctly. Change-Id: I9927a8a67b1743c24cd317bea9ebf5e174b77604 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-301-0/+25
| | | | | | | | | | | | - e82f39989e80dc541b6ad2bfa2ff6ca4679d1bf1 Add changes file for Qt 5.15.1 + f20d5ba29e97b96c9aba39649b853a736986582a Bump version + fc0bbf8a78c19a71287c5f37a23d74b723fb35c0 Remove reference to an attached Accessible object for QtObject type + 8b05eb5e00051cadadd392ab3e731079fcd3d2fa Add changes file for Qt 5.12.10 Change-Id: Id496cc8d678ca6ff868a604a26bc8982b48e583b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 7c29283041a50def3ceca7de4471f211c9b30d4e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Ied32e96eb5c30e662215001ba1277603445fdcd1
* Add changes file for Qt 5.12.10Antti Kokko2020-10-191-0/+20
| | | | | | | Change-Id: I09bf8f3a849fb8e1e185de48031dc7d6bcffa798 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove reference to an attached Accessible object for QtObject typeAndy Shaw2020-10-144-6/+6
| | | | | | | | | | Since a QtObject has no meaning as far as accessiblity is concerned then we remove the references to this and change it to be its own property so that the code relying on it still works as before. Fixes: QTBUG-86315 Change-Id: I1531cc4f855d0dac6dd39820b4646851a1267371 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: If367e951c4084210c9aa85e7aedcf820847a340e
* Add changes file for Qt 5.15.1Antti Kokko2020-09-011-0/+34
| | | | | | | | | | | | | | + 83a41de459cd8605878842b4410521410132dcb3 Change the fsType of icons.ttf to allow installing the icon font + 55e2298f3ff0130fddb09ccd1bcfddce61a8abdb Doc: State correct default wrap mode in TextArea + e5fb9e4ceabc2f1bfd89d3b3cb0a69c7d74df5b8 Add missing override + 5a20af684cf61192d4823869c3a55af7b3c0141e Return QPersistentModelIndex which is stored when calling mapRowToIndex + 1c58ef02d27023a0ee1d47a71368021bd6a6898d Bump version + f4a6a1544c413bd0d39c3b82a048f9d68080e390 Android: use the correct path to DefaultWindowDecoration.qml Change-Id: I291ddb3c883c3ceedb6bf14bf3226b850203f510 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit e22f5c4cd8ff47545e33a30f7a11d4963979ffb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: use the correct path to DefaultWindowDecoration.qmlAssam Boudjelthia2020-08-111-1/+1
| | | | | | | | | | | | | | Regression caused by 7a806347167607172ee38c60d30808b298224a8b. The file DefaultWindowDecoration.qml is installed under "qml/QtQuick/Dialogs/qml/" but the path used assumes it's under "qml/QtQuick/Dialogs/". Fixes: QTBUG-85434 Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 7aeaa7aa1ef38ed337b41ea785852c72e48d6f22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I34987829fd2e4532bcd9d39c0aebb403a01abb33
* Return QPersistentModelIndex which is stored when calling mapRowToIndexAndy Shaw2020-07-182-2/+2
| | | | | | | | | | | | Since the index is stored as a QPersistentModelIndex then this is what should be returned since a QModelIndex can become invalid and to prevent issues with views that may store this index we should keep it as a QPersistentModelIndex so that it is updated if the model changes it. Pick-to: 5.12 Fixes: QTBUG-84853 Change-Id: I0cf8014b386a2a5156f6c2d4f8b6feea823fbe26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add missing overrideAlexander Volkov2020-05-2539-103/+104
| | | | | | | Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a2f9eaf552b58a258beb25d29691fff97276e198) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: State correct default wrap mode in TextAreaDaniel Smith2020-05-181-2/+2
| | | | | | | | | Fixes: QTBUG-84048 Change-Id: I91ec44a5556f5906771642ca947f2e5bb1cd0721 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c7e7fe1f56852863217e052224e80464c9c0fdb8) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+23
|\ | | | | | | Change-Id: Ifcfb3a2bd951530b36e4ee0bc2668e735c727169
| * Merge 5.15 into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Alexandru Croitor2020-04-231-1/+1
| |\ | | | | | | | | | Change-Id: Iec8e88b6b8cc104dfd2cde975f41868730e2090c
| * \ Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I604e0de1afb21e5e62876be7027c0f1e7b1471bc
| * | | Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I55ebc31d9ed7a4cc1e09de1fc704243ebfcd671d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Change the fsType of icons.ttf to allow installing the icon fontShawn Rutledge2020-05-111-0/+0
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used https://metacpan.org/pod/distribution/Font-TTF-Scripts/scripts/hackos2 to change the fsType from 8 to 0 in the OS/2 table. /usr/bin/site_perl/hackos2 -t0 src/dialogs/qml/icons.ttf icons.ttf Fixes: QTBUG-84086 Change-Id: Idc72ca04d5c71bb049c7d6d2c0cd9b40739c2321 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Android: use new Connections formatAssam Boudjelthia2020-04-221-1/+1
| |/ |/| | | | | | | Change-Id: I799d3b22950131c91b6cfe2bf12fc6c1968ab15c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | |/ |/| | | Change-Id: If0ca7a275c088e4e9a174c86e6c4e1046e2e6ada
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: I89f1edc1ca7a4ed755886a2eadbf294e68f1cce5
| | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-111-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | + def0972bf32bb22d5123f409e17f9e92f3809bf4 Stop using QDateTime's locale-specific APIs + caecffab98cb2c47140579712e5b7bc7f7ce3070 Bump version Change-Id: Ia2f013f5636a5b811d37fac78f558b56b26edbdb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Docs: recommend to use QtQuickControls 2 Dialog on Androidv5.15.0-beta4v5.15.0-beta3Assam Boudjelthia2020-03-201-0/+2
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-82781 Change-Id: I98bb77d9118d05b16235cc1107d6e7a74b70fc65 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-183-3/+34
|\ \ \ | |/ / | | | | | | Change-Id: I3022d2eabeef6d387135427b553de8a6d80dff13
| * | TreeView: update currentIndex on model changesAlberto Mardegan2020-03-102-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous binding was not getting re-evaluated when the model was being reset or when rows were been inserted or removed. Here we use a counter variable, whose value change will force the evaluation of the binding. Fixes: QTBUG-53097 Change-Id: I76afebbda78ab477cf65631337a8bad51ca5428d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix deprecationwarning macro callKai Koehne2020-03-091-2/+2
| |/ | | | | | | | | | | | | This amends 52e5dc73b3f61e Change-Id: I671bf2577e845064413a2390366d147aba72d605 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix incomplete QPainterPathv5.15.0-beta2Allan Sandfeld Jensen2020-03-101-0/+1
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: Ib481c9f8454ccc1b7398e2c03b1db16c310ec7e2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Fix build after header shuffling in qtbaseSimon Hausmann2020-03-101-0/+2
| | | | | | | | | | | | Fixes: QTBUG-82787 Change-Id: I3f3f1537f1f6c8b27306aedcd38d056e0fa984b2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-273-69/+59
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: Ia4f49f7923d266e669d257d14319f3537105a1ac Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Combine repeated logic to get Dialogs QML files into one functionv5.15.0-beta1Assam Boudjelthia2020-02-171-46/+20
| | | | | | | | | | | | | | Add fileLocation() function to return the path of each dialog type. Change-Id: I7213e8cd09f61eca000f481b1cae58e9e5b3405e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-051-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I208e2e1d8da2123359be0581c83557e862465247
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I2adee7799f1c8d762cdea06f9bcd4edb51d783ca
| * Stop using QDateTime's locale-specific APIsEdward Welbourne2020-01-281-1/+1
| | | | | | | | | | | | | | | | Use QLocale's date-time APIs, instead. Task-number: QTBUG-80441 Change-Id: I75453a002e0eea299d0527c0fa9431dc8bc53c7f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
View Lorry Controller Status