summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | Change-Id: Icbbf5d09830ac8ed9431e955efa370fd08ebbbe9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ibf4b1b169b1257967df0ce63709fe68772dc02fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | Change-Id: Id7f658dced2b965746e7f307b2f0966b5e065d1f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-221-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie00304b362f241b9d4d5a5cd55202fe57f8f0137 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-2229-110/+89
|\ \ \ | |/ / | | | | | | Change-Id: I6a129f4eb0a2ceca1130ba8604cc1cf04a40b211
| * | Adapt to new Connections syntaxUlf Hermann2019-10-2027-75/+86
| | | | | | | | | | | | | | | | | | Change-Id: I299baf89f2530250a333736bb31f4ae470610176 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-192-35/+3
| |\ \ | | |/ | | | | | | Change-Id: I4044a522b132a0045858311d5628409a3225f3d4
| | * Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2Liang Qi2019-10-141-35/+0
| | |\
| | | * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-10-141-35/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/extras/data/tst_tumbler.qml Change-Id: Ia8b373767a311e973e3b171109b6b8b6c33f82b0
| | | | * Remove test_resizeAfterFlicking from tst_tumblerMitch Curtis2019-10-091-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing flakiness in CI, and tests a weird edge case, so its value as a test is very low. Change-Id: Iaeb2633bd270dc8e88420ace5efe9ab156339733 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | | Blacklist Tests_TableView::test_headervisible on macosUlf Hermann2019-10-141-0/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-79161 Change-Id: I94f2d7bb16db92fcce87086c9abf8b4b0a39f792 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I7408af583e9696262dbd1fdb979978c60fa045de Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc7d718f1778a53c18f3e8490794fdd702031558 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6dad078a340a80a930c1a1651d11056e966cd059 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib9b2603c2d763eccd5a4649c2cc98520c34b43d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia94282eeab6d4d2a76721a2b300432df4fba2ddf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I3013aa4b1e0fa986ba78378a53fbdc6ab2c2ef52 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I81790c403fa059854b9b582c0817fb89be7765dd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-1528-71/+255
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ia150cd4c2e446eca3e6fbc23d9ebdf4c4e2a7516
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-1228-71/+255
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
| | * | Make restoreMode on all Binding elements explicitUlf Hermann2019-10-0424-57/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Android: Always load qml files from resourcesv5.14.0-beta1BogDan Vatra2019-10-013-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML files on Android are now available in :/android_rcc_bundle/qml folder, this way we don't need to extract them at very first start up. [ChangeLog][Android] Always load qml files from resources (:/android_rcc_bundle/qml) Change-Id: Ib905e5d5e1577d99bb89e7e0d237fa8b24a1e95f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-281-1/+1
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-281-1/+1
| | | |\ \ | | |/ / / | | | | _ | | | | Change-Id: I5c3215469c4b5f45943e8937e8b1eb309c6aed92
| | | * Only calculate the height of the ListView when there are model entriesAndy Shaw2019-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it tries to calculate the height of the listview then it depends on the model having entries. If there is no model or no entries in it then it will cause a warning to be outputted indicating that the model size is less than 0. This prevents it from occurring as a result. Fixes: QTBUG-72543 Change-Id: I7155a3a240fdcdf93caddfce332f0cc6bb0f0ec0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Guard against flickableItem being null when scrollingUlf Hermann2019-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes error from qmlplugindump: ScrollViewHelper.qml:147: TypeError: Cannot read property 'originX' of null Change-Id: I1bef74acda8fb4e1850967c4d684ece7d458699b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | tst_tumbler: adapt test after changes to PathViewMitch Curtis2019-09-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3df387d63421f09533ab72e2a73fb5d259693120 changed the flicking behavior of PathView slightly, so we need to adapt this test to reflect those changes. Fixes: QTBUG-78471 Change-Id: I093bfea9a4d089b4f61c405ab41aa1f4ea77d422 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I946295e6e5ec3dcc0164621f378a730d0a4f3d5b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I777e071c7376bae46c9c66f8f9e830c70a622393 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtquickcontrolsQt Submodule Update Bot2019-10-091-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia72cca70401eb3e5ca607da5f76573bd89f68986 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia67e234daea1d042d8591e224065ed784060f5b4
| * | | | Bump Qt version to Qt 6wip/qt6Alexandru Croitor2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45a24634edcc267381c807fd99687473d14ccd44 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-243-1/+42
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-243-1/+42
| |\ \ \ \ \ |/ / / / / / | | | _ / / | | | / / Change-Id: I11399fcf7d56d7001e0eb5834cac185247d18d65
| * | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-193-1/+42
| |\ \ \ \ |/ / / / /
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-193-1/+42
| |\ \ \ \ |/ / / / / | | | _ / | | | / Change-Id: I6eeb300362ec0769eae1e48f3409424f977e3774
| * | | tst_tumbler: temporarily disable a test to let qtdeclarative change inv5.14.0-alpha1Liang Qi2019-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3df387d63421f09533ab72e2a73fb5d259693120 changed the flicking behavior of PathView slightly. Task-number: QTBUG-78471 Change-Id: I403f06bed8c790196e5fc8c3ec8f3ea59b91f23e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-172-0/+40
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| | |\ \ \ | |/ / / / | | | | _ | | | | Change-Id: I7fd8b4fa79b25e4e5753d37749233bed942bef7f
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | |\ \ | | |/ / / | | | | | | | | | | Change-Id: I9632a4f67cd4f96b0b5ad8010266463525f1f6e7
| | | * | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ \
View Lorry Controller Status