aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-03-021-1/+1
| | | | | Change-Id: I72e9369f0e78954b6c760eb5af1841a8bbd79441 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tests: Do not delete device prematurelyFabian Kosmale2021-03-012-4/+3
| | | | | | | | The delivery agent expects the device to live longer than itself. Pick-to: 6.1 Change-Id: I3c837633f2c4a91f5b370df4d486a01b2ee05f13 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* testbench: don't override style stored in settings with default styleMitch Curtis2021-02-251-1/+1
| | | | | | | | | | | | | Now that we choose e.g. Fusion by default on Linux, QQuickStyle::name() will return that. If the user had a style previously selected and that was stored in settings, we should respect that. So, only prefer QQuickStyle::name() if we're not using the default style. Pick-to: 6.1 6.0 Change-Id: I986f4b169bb99836714f2f2ed99f17746686f946 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Convert manual tests to CMakeMitch Curtis2021-02-2512-0/+486
| | | | | | Pick-to: 6.1 6.0 Change-Id: Ia974de4a852b70a9b9fdc79a819229393758c9d7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove redundant qmldir filesAlexey Edelev2021-02-2317-754/+0
| | | | | | | | | | qmldir files to be generated by the cmake build procedure and don't need to be stored in the source tree. Task-number: QTBUG-88263 Change-Id: Idff2800b5b2b6cb74d79a2f42fff717522c10ade Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-231-1/+1
| | | | | Change-Id: If950887ca8ca4531819197bbb41170cf74ea172a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-221-1/+1
| | | | | Change-Id: I3ec4aabb9a5d13ac78da3856dff86a463eeec3ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-201-1/+1
| | | | | Change-Id: I79788c97ccbbdfbb9c02c41e25fbc67393e5252e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-201-1/+1
| | | | | Change-Id: Ia5f4685580c3b236fb3c19cebca794edd46b019a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-191-1/+1
| | | | | Change-Id: I040a59c00a5a5600523773c3eb027afee56acd1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-191-1/+1
| | | | | Change-Id: Ifface1ab349c5cffdf231df2f814d5c2d7ed42a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-02-182-2/+2
| | | | Change-Id: Id96b84b8ade70d5be0318520b286fc6a43ccef38
* Fix namespaced Qt buildKarsten Heimrich2021-02-171-3/+3
| | | | | | Pick-to: 6.1 Change-Id: I688bdd73c939304f572d0e162e7aa09499bf737f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-171-1/+1
| | | | | Change-Id: I7461988ea5b652289cd7ce4a458258895c660dc2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-161-1/+1
| | | | | Change-Id: I0fcf94e57f75fd31ca93173e5b5928107c906ddf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ComboBox: don't focus TextField when clicking on indicatorBartlomiej Moskal2021-02-162-7/+30
| | | | | | | | | | | | | | | | Remove focusing editText for Combobox when clicking on indicator (when editable is set to true). Focus on Edit Text should be set only intentionally by user. Before this change, when focus was set on Combobox, it automatically set focus on editText. It was also happening when drop down indicator was clicked. Because of that, on some platform (like Android) virtual keyboard was appearing in case when it shouldn't be shown. Fixes: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: I813dcc3099c919ec32f0683e7e60e6082c5bc389 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Blacklist flaky tests in tst_QQuickPopup on macOSTor Arne Vestbø2021-02-151-0/+8
| | | | | | Task-number: QTBUG-89938 Change-Id: I3602056fa3f7f0227b80c6c775153bd444c88f24 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-131-1/+1
| | | | | Change-Id: I4ce07117f20d9f499120e262608709bd18a2d0a8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-131-1/+1
| | | | | Change-Id: Icfa5ab0afdc8b45f687c74f13fc00780f7f83c13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-121-1/+1
| | | | | Change-Id: Ia2ba541c636bbbfa485f8b185e010c0e7a3c9218 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-121-1/+1
| | | | | Change-Id: Iaf0193d548700520d4ec1fbeb91e7a8c96c76ba1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QMake project filesJoerg Bornemann2021-02-1180-3272/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I4247294258629c92e80914518e9208019090c815 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-111-1/+1
| | | | | Change-Id: I40d1903b37d092370939695f133b766eade3c9e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-111-1/+1
| | | | | Change-Id: Ieab4f6cb5b90a38a97af473feb2c3bebf8289d60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-101-1/+1
| | | | | Change-Id: Id25fe7ba5b01fddbde8100a7b897af5162fce25c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-101-1/+1
| | | | | Change-Id: I5ccf86c5e01d60441431f25466653c27b95db85b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-101-1/+1
| | | | | Change-Id: I05cb3ef198f1defb963f6356f5da07869b467d60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-091-1/+1
| | | | | Change-Id: I8f633ef81dbbfd4faeb6db391e0666f140b7fe34 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-091-1/+1
| | | | | Change-Id: I3a2a43d378325946a4d650ea00bbf86b505f0b8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-081-1/+1
| | | | | Change-Id: Ieffe626d4b2d1867c70cae9c9402c67eb9d7a850 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-081-1/+1
| | | | | Change-Id: I306bc5821130e1f27c1dd15b0568cd80123865fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix rounding weirdnessAllan Sandfeld Jensen2021-02-051-1/+1
| | | | | | | | | | Avoid using binary unrepresentally numbers like 0.1 which rounding is necessary. Pick-to: 6.1 Fixes: QTBUG-90928 Change-Id: Ie7dc31bd98d0af1447bffcfc30a315a743697f67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-021-1/+1
| | | | | Change-Id: Ib3745691bd0d57bf9f89de104bf33f256c539cf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-011-1/+1
| | | | | Change-Id: Ie546eced19de3b25d46239ea55aa8f9ca7c2c722 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* a11y: Fix ordering on header, content item and footer in PageJan Arve Sæther2021-01-2911-3/+286
| | | | | | | | | | | | | | | Because of the previous behavior, the footer could be read aloud by the screen reader before the content item. And even worse, the footer could be read aloud even before the header in some cases. This made it hard for visually impaired people to use the application. The Page type was used by the Dialog type, so it also affected that. Fixes: QTBUG-75042 Pick-to: 5.15 6.0 Change-Id: Ic3e8ec3f7dcf18af9262b1d35c986835c8da6900 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-291-1/+1
| | | | | Change-Id: I8a52dfc6e6cc6e0933f2933b33bf04df2d6e26b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Combobox: Fix initial set of inputMethodHintsBartlomiej Moskal2021-01-282-6/+16
| | | | | | | | | | | | | | | Fix for setting up initial inputMethodHints to Qt::ImhNoPredictiveText for Combobox. Before this change, Qt::ImhNoPredictiveText was never set for Combobox. As inputMethodHints() by default returns Qt::ImhNoPredictiveText value, setInputMethodHints didn't allow to set this value correctly. Task-number: QTBUG-61021 Pick-to: 5.15 6.0 Change-Id: Ie4ec0d32fff7586bc3a8bd055b752000c0330fad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Adapt to hover on disabled itemsAllan Sandfeld Jensen2021-01-283-4/+4
| | | | | | | | Only react to hovered on enabled items. Fixes: QTBUG-90580 Change-Id: I955033f391e6cd592e3d75b79b9242019db9fcfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-181-1/+1
| | | | | Change-Id: I52631e85cf4ccfccdb616bc71762e62849bef42d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-181-1/+1
| | | | | Change-Id: If8129bffb4030112fad03df89234678fe32cb282 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-181-1/+1
| | | | | Change-Id: Iafbfd71a9d10919f2bf743497f1ccb83cc3d0cc8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-151-1/+1
| | | | | Change-Id: Ia053f10d83901bb8d010d27a7b6885a5d6c8a297 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-151-1/+1
| | | | | Change-Id: Ie2230b9534da1423dc84746a7b745e3b4eed0467 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-151-1/+1
| | | | | Change-Id: I8141ed9f54b39c132eaabc8fbb3e62952c2ba44c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-151-1/+1
| | | | | Change-Id: Iaea2513a48164de1745f505132334078b35d526e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix initial currentIndex in Tumbler when wrap is set to falseAlexey Edelev2021-01-142-2/+24
| | | | | | | | | | | | | | | syncCurrentIndex () function assumes that PathView is used as view for, Tumbler component, and states that actualViewIndex should be 0 while initialization. This statement is not correct when Tumbler is in non-wrap mode and uses ListView as view, where currentIndex is set to -1 by default. Fix actualViewIndex condition according to ListView logic. Fixes: QTBUG-84426 Pick-to: 5.15 Pick-to: 6.0 Change-Id: I4ef1e7b45399bf748968490f44b8909f3218d9bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Skip failing test_focusLeavingDialog function on offscreen platformMitch Curtis2021-01-141-0/+3
| | | | | | | Fixes: QTBUG-89909 Pick-to: 6.0 Change-Id: I09876b50d4a7d53e1e9c220d44753ab84592a62a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Fix MSVC warnings about precision loss when converting double to floatFriedemann Kleint2021-01-144-4/+4
| | | | | | | The warnings appeared after porting QCcolor to float. Change-Id: I248f15a7a403281e849f030e412c159f9732261e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeDelegate: ensure background and contentItem are resizedMitch Curtis2021-01-144-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the geometry of a control changes, this code is called: void QQuickControl::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickControl); QQuickItem::geometryChange(newGeometry, oldGeometry); d->resizeBackground(); d->resizeContent(); if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width())) emit availableWidthChanged(); if (!qFuzzyCompare(newGeometry.height(), oldGeometry.height())) emit availableHeightChanged(); } SwipeDelegate works by moving the background and contentItem together when it is swiped to expose the various delegates. Because this involves setting the position of the background, the check for background's x position being 0 in QQuickControlPrivate::resizeBackground() would fail and the background would not be resized at all. Fix this by making resizeBackground() virtual and don't check the x when checking if we should set the width. Similarly, in QQuickSwipeDelegatePrivate::resizeContent(), we should set the contentItem's width instead of just repositioning and resizing it vertically. Fixes: QTBUG-85770 Pick-to: 5.15 6.0 Change-Id: I36684bf2797719db87fe93063cc7685efe594eea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-141-1/+1
| | | | | Change-Id: I19bbd45f29a971ea7dfda04c5deb519607ee20ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>