summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix touch gallery example crashes on exitHEADdevJani Korteniemi2022-01-041-0/+1
| | | | | | Task-number: QTBUG-40501 Change-Id: I8c51818e8846be3a2813ac2fa8871a9d75c22439 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Bump version6.2Jani Heikkinen2021-05-241-1/+1
| | | | Change-Id: Ie272279181dd83cf3c528143dc3505b49c1f9209
* 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>
* Use QList instead of QVectorJarek Kobus2020-08-317-86/+86
| | | | | | Task-number: QTBUG-84469 Change-Id: I9109f92d059fd4152aee1f37597c5564d477fbf9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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 Pick-to: 5.15 Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-282-6/+6
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I56268bc09fe861effc514acb4033bf8873873ab0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add missing overrideAlexander Volkov2020-05-2539-103/+104
| | | | | | Pick-to: 5.15 Change-Id: Iba896b0af174ed28a27413d7343427cf9b4600d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-142-0/+23
|\ | | | | | | Change-Id: If2e68359e05a5be8db3330ba9af6245c50eab8ba
| * 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>
* | | | Update 'dev' dependenciesAllan Sandfeld Jensen2020-05-124-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Along with compile fixes Change-Id: I7fc6397df83d485fbc4714ead16e74bfd079c90f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Doc: State correct default wrap mode in TextAreaDaniel Smith2020-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-84048 Pick-to: 5.15 Change-Id: I91ec44a5556f5906771642ca947f2e5bb1cd0721 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Put TreeView from Qt Quick Control 1 under BSD licenseVolker Hilsheimer2020-04-292-38/+60
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d4f5ca2ed42e7ee0d9ce3a4e0a861902aee27e6 Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-252-1/+21
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I31184909e2a74b6e79c966669e88ab8f9dd3ef1c
| * | | 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>
* | | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Iab80b17f3eacf88db45f62895529a6b855fdb54c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Push dependency for qtdeclarative and fix resulting test failuresAlex Blasche2020-03-313-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables other modules depending on quickcontrols and declarative to resolve their conflicts. Change-Id: Iea28fa75157034d85dc24f44491ca986902db547 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-315-3/+39
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
| * | | 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>
* | | Add missing includesJan Arve Saether2020-03-272-0/+3
| | | | | | | | | | | | | | | Change-Id: I9ad8cdc6b603896932619aba8afbef6ab12717ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Compile controls after changes in the meta system that broke itJan Arve Saether2020-03-2511-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Problem was that moc needs to have the full definition of the types, it's not sufficient for it to have a fwd-declared type anymore. Change-Id: Ie1f1402d53e4336cd4afd018f5ae4dbdc88118c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-035-116/+80
|\ \ \ | |/ / | | | | | | Change-Id: I3b9f858168f48c8479e6f394f8b87dda61e0adba
| * | 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>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-043-4/+45
|\ \ \ | |/ / | | | | | | Change-Id: I3f001a2eaf9eca29c92ee585dc281096d848b45f
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-283-4/+45
| |\ \ | | |/ | | | | | | Change-Id: Ifafbb9982454f62dcf1ccc1c5ed8661138dd01f8
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-273-4/+45
| | |\ | | | | | | | | | | | | Change-Id: I26504ec0e2a0ea6ec3373394ea51132b65982c92
| | | * Merge 5.14 into 5.14.1v5.14.15.14.1Kari Oikarinen2020-01-152-4/+1
| | | |\ | | | |/ | | |/| | | | | Change-Id: I91a981474478b244f956497347155d5c44e4fc84
| | | * Android: Look in the correct location for the supporting QML filesAndy Shaw2020-01-152-4/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: I99db8554f88d39a2e9376b50bb1a6f8a334cf461 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | | * Add changes file for Qt 5.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 52e5dc73b3f61e0453eb939314c3ea67b02ce7e3 Doc: Add a note about the deprecated controls 1 + fbc0fe81fad9fbc80180503ad439f1db0a698a9e Bump version Change-Id: I871d50375f402f14153c5b26695aff644b32d85a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2020-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic42a6bcd8a2ad80936a1a8c971430ec0d10a3493 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2020-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icfe8d2beecde39401d4ad27a9c2c3fbcc3f97195 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2020-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ca74012693002eee42da8fdea1240936d2b14a1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-142-4/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9397a8bf036dd2d40b39e63a9fff293335be059d
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-112-4/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ia4ce71363671afd3f3a6ae8ff4740388c007f7f3
| | * | Doc: Remove \internal command from a \qmlabstract typeTopi Reinio2020-01-102-4/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the type is private, other types inheriting from it must also inherit the property documentation. \qmlabstract handles this, but only if the abstract type is not \internal. Remove incorrect links that were trying to fix the issue previously. Fixes: QTBUG-79469 Change-Id: I9b9bb0af84abf44c5cbe9e1770659cff24834dd6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>