summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
|\ \ | |/ | | | | Change-Id: I604e0de1afb21e5e62876be7027c0f1e7b1471bc
| * 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>
* | | | Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+23
|/ / / | | | | | | | | | | | | Change-Id: I55ebc31d9ed7a4cc1e09de1fc704243ebfcd671d 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>
* | 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>
* | | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I66b5bab910b3678985b02224a98552d28ca1b301
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: Id2746353959076424fe4b43a228e22512f60ca54
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+28
|\ \ | |/ | | | | Change-Id: If6701da2da39460971b3fe7aaf249f4cbfbf66e3
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+28
| |\ | | | | | | | | | Change-Id: Iadd8ea7d5a6c7557a795ccffa1719794dda260b5
| | * Merge 5.14 into 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Kari Oikarinen2019-11-261-3/+3
| | |\ | | | | | | | | | | | | Change-Id: Ib7231d4458c8ede386044df356adf935e14d98b4
| | * \ Merge 5.14 into 5.14.0Frederik Gladhorn2019-11-2118-58/+65
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ib75e2e1d50e88c7e22a5bba34159c4e1af35ccbc
| | * | | Add changes file for Qt 5.14.0Antti Kokko2019-11-191-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I295905d1b4e77ecf9540dab3854ac38748d9f457 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | | Avoid initializing QFlags with 0 or nullptr in testsFriedemann Kleint2019-12-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is being deprecated. Amends d1697d81866abaf217b6647b0f42a13fa974636b. Change-Id: I7ec2e8d5d07b86eebeb9e16c35f70e3c93a4b037 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-077-0/+37
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ided88edd678ef05c3f69cfa374b8a79e64f5c812
| * | | | Doc: Add a note about the deprecated controls 1Venugopal Shivashankar2019-12-057-0/+37
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help readers who will end up on the Controls 1 pages through a web search. Change-Id: I9c40f6c66c72e5a456dd903485133c64cb386f8f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-301-3/+3
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: If74417371b0e4d0a7f2523e4e003420867e2f56e
| * | | tst_tumbler.qml: fix failing test_currentIndex() testMitch Curtis2019-11-261-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Use correct (i.e large enough distance) to ensure the current index changes. Fixes: QTBUG-80152 Change-Id: I26873e83fbd520965495104177ba09a38f566257 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Fix warnings about providing function for DESIGNABLE in property declarationFriedemann Kleint2019-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Set them to be designable by default, fixing: qquickaction_p.h:65: Warning: Providing a function for DESIGNABLE in a property declaration is deprecated and will not be supported in Qt 6 anymore. Change-Id: I411f71062d78facb5a8ed311d324cbbf083e2efd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Fix deprecation warning about qmlRegisterType()Friedemann Kleint2019-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use qmlRegisterAnonymousType() instead, fixing: plugin.cpp:199:53: warning: 'int qmlRegisterType() [with T = QQuickControlsPrivate1Attached]' is deprecated: Use qmlRegisterAnonymousType instead [-Wdeprecated-declarations] Change-Id: I23e7559798c461fa9c3a3608b5a816d334fdd021 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-251-5/+5
| | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I9dbd2c23e122161cf7216303c65c25678c472545 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1918-58/+65
|\ \ \ | |/ / | | | | | | Change-Id: I4c1a5d2aa625740a57325276098b82727b7925bd
| * | Doc: Fix documentation warningsTopi Reinio2019-11-1418-58/+65
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All warnings in qtquickcontrols were related to \qmlmethod or \qmlsignal parameters, except for the missing dependency to qtcore in Qt Quick Extras. There's some inconsistencies with how QDoc parses QML method parameters, especially for qml signals - in some cases the \a command is replaced with \e to clear the warning, even though the parameter name referenced with \a does exist. This commit brings the current warning count to zero. Fixes: QTBUG-79828 Change-Id: I3d3d02583498c5a579f6476273e10e75680d940c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-124-0/+4
|\ \ | |/ | | | | Change-Id: I1d6fd78aa3b9ef7899a14c95c5e06b2d44458d80
| * Add missing depends entry for QtQmlAndy Shaw2019-11-064-0/+4
| | | | | | | | | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-054-35/+392
|\ \ | |/ | | | | Change-Id: I1ddb1de98d15c70274040984d2e685a72827dc05
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-044-35/+392
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ide73d291e885a0455765263716ea2b972d7ae62b
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+21
| | |\ | | | | | | | | | | | | Change-Id: Icb6da7c1d662261ec1b80fbd54d1b9dc7b573824
| | | * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b37db1f31b3248e9d32d0ccbb42e77035fa5b340 Add changes file for Qt 5.12.5 + da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 Only calculate the height of the ListView when there are model entries + 7f61a351148c7d67f8f4ee6f2d2c4a9c53766297 Remove test_resizeAfterFlicking from tst_tumbler Change-Id: I7bd32e2f04223df753615b0b3315244cef46e316 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I6de0ffd4952bcecbcf92ff925d450ba4c4beb45f
| | * | QQuickTreeModelAdaptor1: fix updating of ModelIndex roleAlberto Mardegan2019-10-293-35/+372
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to store the original QModelIndex as a role has the unfortunate consequence that we need to emit the dataChanged() signal whenever its value change. The previous implementation of the "move rows" operation failed in delivering this update in most cases. While addressing that, this commit also fixes some similar issues with the HasChildren role not being notified in certain scenarios. Also, when the last child of an expanded item gets moved away and later placed back in the original position, the item should not remember its expanded state, but rather accept the children while staying collapsed. Last but not least, it's important that the endMoveRows() protected method is called *after* the original tree model has completed its movement, because otherwise its elements might be accessed while in the wrong state. Similarly, we don't want the dataChanged() signals to be emitted while rows are moved or removed; we queue up these events and fire them only after the item indexes have settled. Fixes: QTBUG-59606 Change-Id: Ib981c912ea19908e1283cc463331c3053d4d6e7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
View Lorry Controller Status