summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I0bdd7ef48927c66a0aefd1a6004ec2d7baccb858
| * | 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.15' into devQt Forward Merge Bot2019-12-211-0/+28
|\ \ \ | |/ / | | | | | | Change-Id: I21980a5e2c81f825b681a18e46d98a67e15d9204
| * | 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>
* | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-148-4/+41
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I87e8f3e363c7514b0cd9004b848ee0ca607548a6
| * | | | | 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.15' into devQt Forward Merge Bot2019-12-071-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I2ccffea822f00b4437c1ca56a421ad868e87103d
| * | | | 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>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I30bfbdf02a834801b534c28c692226337acbadf2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib82f326c184f62a75152a9f498e8ad8b6a0b847a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-303-7/+7
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I2337e41f418f1edcb28e8e2a3fccac812d9f6516
| * | | 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>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5a0040c3e99d2c185b4eaa7910d7c7dfd6cc852 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia714d5a0a3309f6b9f17da5162a904f12dda39a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b14228b59e9cd60df86c0b2f3836750513be90d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d186a938922e04097a2561893ae6b6e45c216ca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2318-58/+65
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ie28ab026847821e340c765868d333a6aafd72cb8
| * | | 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>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | Change-Id: I7144650b400c76892529fe7ffbf0096d540b711e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-164-0/+4
|\ \ \ | |/ / | | | | | | Change-Id: I5dde2484b97c5ef23bd83b377635a86b0441b95f
| * | 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>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-141-2/+2
| | | | | | | | | | | | | | | Change-Id: I4dde5ea8fdb5332886653b3bc44dffa2d30fc706 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | Change-Id: Ied56c90746ae3c99b4709b1fc809baa455032a44 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-094-35/+392
|\ \ \ | |/ / | | | | | | Change-Id: Id68a064b10425309464392748c20ae0791916927
| * | 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>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7acb534bf4e48ad33f7e077ff67d7567ad92bec Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I40d0b4b7bedd7a906b01eac884eb9be039a37cfa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4fea1707492e8e4b555f72dfedacce78e850f973 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b011800f679b73b1254ffd9df04faefcd4b891d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-024-715/+714
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I7d72f7a263bb4130d95267f39be953e9f33f87d5
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-264-715/+714
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ib3ca61bf2e6506242f62f4add82f0162f0a0f123
| | * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-234-715/+714
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I3d6c4c3239107b25731d8e355c774a6b8b70a601 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie2a3deb67249a278995d07e83551818c2d9db4f4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status