aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qtquickcontrols2v6.1.0-alpha1Qt Submodule Update Bot2021-02-121-1/+1
| | | | | Change-Id: Icfecd588e68d0174fc4430e4a21592fda32249ca 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. 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> (cherry picked from commit be7c1c9dd4eeedf9760903b217de3d302bfe6c2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-111-1/+1
| | | | | Change-Id: I4a1d7b2c7bf0605b17af6c73df6d29b90585a2fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-101-1/+1
| | | | | Change-Id: If6e0f1f2a5f4d6be45d0e221926239e3128ed8c5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-101-1/+1
| | | | | Change-Id: Idbf42c62bfc145891e9302f404fdf9b6c09ca39e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-091-1/+1
| | | | | Change-Id: I41aa7200695d7448c790199a6bdc405596566a5c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-091-1/+1
| | | | | Change-Id: Ifb6c35350a00c77670160ad5bade4a5f56c37498 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-081-1/+1
| | | | | Change-Id: Ifd91c8c00553fbcf40fdef099b3430ea7b659db7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-061-1/+1
| | | | | Change-Id: I111dcc50bd188ede1a4461ce5e873ef15cee865c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-061-1/+1
| | | | | Change-Id: I9a9fe92dbd02d51cc82df3aaa38a76c44063f185 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-051-1/+1
| | | | | Change-Id: I354caf7bb8a51e6a0e0b41e892e49ec891c46bfe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-051-1/+1
| | | | | Change-Id: Iec888a69ffad446204c137a0bd5d9bec640a465d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtquickcontrols2Qt Submodule Update Bot2021-02-051-1/+1
| | | | | Change-Id: I4f326e8bdf4a77a29c0aa91fc10b76833c071cef 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. Fixes: QTBUG-90928 Change-Id: Ie7dc31bd98d0af1447bffcfc30a315a743697f67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d1f85b5f96944b93edd8b08507c22aef553aa713) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>
* QQuickStyleItem: add debug flag 'SaveImage'Richard Moe Gustavsen2021-01-132-0/+12
| | | | | Change-Id: Ifbaadd993924022b1351927aaf3987cb94c74df8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Windows: add 9p margins to scrollbarRichard Moe Gustavsen2021-01-132-0/+28
| | | | | | Pick-to: 6.0 Change-Id: I8d56f7b7071c51d4dfc88e12864bc3e0e7c5ab10 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Manual test, nativestyle: fix frame sizeRichard Moe Gustavsen2021-01-131-1/+6
| | | | | | | | | | | | | | | | | | | | A Frame will will set it's own content size to be the same size as the implicit size of the child. But for some controls (TextEdit / TextArea), the implicit size is either read only, or should not be changed. For such controls, you need to set contentWidth/height explicitly on the Frame instead. Otherwise the frame will wrap around the implicit size of the item, and not it's actual size. For a TextEdit, the implicitWidth can sometimes be slightly smaller that the actual width, since the text is not drawn all the way to edge before it wraps to the next line. The result is that the Frame around it ends up smaller than it should. Pick-to: 6.0 Change-Id: Ibf800373d4424ffdb3e95475d9638503c2e99572 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* ScrollView: let flickable have pixelAligned set to trueRichard Moe Gustavsen2021-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | A ScrollView will typically contain other controls. And if we're using a dpr with a fraction (e.g 1.25), the position of the controls will sometimes jitter as you scroll. The result is that if e.g a Frame is wrapped tight around around a Rectangle, the frame will sometimes be outside the rectangle, and other times on top. This is because of rounding issues when drawing the Frame vs the Rectangle. So let the default flickable used by a ScrollView have pixelAligned set to true. This will give the best cross-platform "out of the box" experience. The developer can always choose to use his own Flickable for ScrollView, and tweak it, if such default behavior is not wanted. Pick-to: 6.0 Change-Id: I7dc7b0b390dbf055f35cca2a6c15a6075e33c0a4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Ensure the ninepatch image is detachedLaszlo Agocs2021-01-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more contrived usages of nine patch images can uncover an issue with the nine patch node implementation when used together with the threaded render loop of Qt Quick: pixmapChanged generates a QImage that references external data, which then gets passed to the scenegraph in updatePaintNode during the scenegraph's sychronization phase. This pattern (QSGTexture from non-data-owning QImage) should be avoided in general, because when the gui thread gets unblocked and continues after the sync phase, it could invalidate the data the QImage points to. If now the independently running render thread happens to try accessing the data (still the QImage that got passed in in the sync phase), bad things may happen. While it can be difficult to reproduce an actual crash (without ASAN and such), logging with the specially crafted example code shows that the logic is problematic if non-owning QImages are involved: (the pointers are the QImage's constBits) - pixmapChange 0x1f1053a5954 [gui thread] - updatePaintNode 0x1f1053a5954 [render thread, gui blocked] - beforeRendering [render thread] - pixmapChange 0x1f1053e7424 [gui thread] - QSGPlainTexture bind/update 0x1f1053a5954 [render thread] // but 0x1f1053a5954 may be invalid at this point if not owned by the QImage passed to createTextureFromImage - frameSwapped [render thread] Pick-to: 6.0 5.15 Fixes: QTBUG-88162 Change-Id: Id83d04fce668a3e05d150c086abdecc9d59e51e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix popups with exit transitions blocking mouse events when destroyedMitch Curtis2021-01-133-4/+163
| | | | | | | | | | | | | | | | | | | | | | If a popup had an exit transition set and was destroyed upon e.g. being rejected, it would not destroy its modal dimmer, and so events would not go through to popups that were beneath it even after it was destroyed. QQuickPopup's destructor does indirectly attempt to call finalizeExitTransition() through a setParentItem(nullptr) call, but prepareExitTransition() returns false if it sees that the exit transition is already running, and so transitionExit() never calls finished(). This patch fixes the problem by explicitly calling finalizeExitTransition() in QQuickPopup's destructor if the exit transition is running. Fixes: QTBUG-89673 Pick-to: 5.15 6.0 Change-Id: I468fae52f6a83ac314877c67d062028634bb7e17 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Ensure that C++ Qt Quick tests are run with all applicable stylesMitch Curtis2021-01-134-1/+23
| | | | | | | | | | | | | Since 8b534487044dfb3b464431ecb91ef4e0864af4ed, the C++ tests were only being run with the default style for the platform that they were run on. Fix this by keeping track of whether a default style is in use and checking it in the tests. Pick-to: 6.0 Change-Id: I4ddd90aba12ede83fff0d3d1002534e79fce8c87 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qquickstyle: don't use test macros in helper functionsMitch Curtis2021-01-131-5/+9
| | | | | | | | They don't do anything outside of the test function. Pick-to: 6.0 Change-Id: Ie66e707c0963bbcaaadbdf6340ef393dd028b303 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Bump versionPaul Wicking2021-01-131-1/+1
| | | | | | | | CMake edition. Task-number: QTQAINFRA-4126 Change-Id: I2c85fc4040edf1004220ab964437bf56ad1e5e3f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Use CMAKE_PROJECT_VERSION for VERSION of QML modulesMitch Curtis2021-01-1310-10/+10
| | | | | | | | | | This ensures that the modules provide versions matching the current Qt version. Change-Id: I164b54af60de3b2b6ca6f54c417eb58b1eafd1e5 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-131-1/+1
| | | | | Change-Id: Ice6a2a17e267d5cfc763d3b7f42047b8b5588b80 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-121-1/+1
| | | | | Change-Id: I9c8ebfa0b1757925ca07b9f2067843d347eace2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-121-1/+1
| | | | | Change-Id: I31c469baf67ab5f027b3b69ac13c95c6353ce3c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-121-1/+1
| | | | | Change-Id: I4baa896088a380065eb97f0253efa3b275037956 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickStyleItem: use correct enum numberRichard Moe Gustavsen2021-01-111-1/+1
| | | | | | | | | | It should of course be 4, not 3. The result of it being 3 is that we would always also print info when debugging imagerect. Pick-to: 6.0 Change-Id: I257159b25b8aad1848d82af9855ecd194e7360a0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Doc: Fix typo in \sa statementNico Vertriest2021-01-081-1/+1
| | | | | | Pick-to: 6.0 Change-Id: I3461744b8e784d9c3c775f06bffe8f7b3965073c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-081-1/+1
| | | | | Change-Id: Ic9517b7c353ae3df40be955559a2091677671716 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-071-1/+1
| | | | | Change-Id: Iedcb4086e8b0397fb2d87c812e34a947dbd1db0e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 01:26:32 +0000