aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Make sure implicitWidth/Height is valid when component is completedJan Arve Sæther2021-08-271-0/+1
| | | | | | | | | | | | | This makes controls have their correct initial sizes without having to wait for polish(). This fixes ~80 test failures in native windows style Task-number: QTBUG-95679 Pick-to: 6.1 6.2 Change-Id: I0711ace1e95e84128b66df22e52001b340eea8a9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1b66b7727272ec28f31a1672032346792350b5b7 in qtdeclarative module)
* QQuickPlatformFolderDialog: Allow opening selected folderFlorian Richter2021-08-251-2/+6
| | | | | | | | | | Before a folder needed to be made the current folder in the OpenFolderDialog, now it is enough to select the folder in the dialog. Fixes: QTBUG-76860 Change-Id: Icc91db76c0badc3b8397a87ec7202db41999dea3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (adapted from commit 4ec8c0700cd0e6bc1b2dfb08fff5e9e15288e047)
* Windows, Button.qml: inherit from DefaultButton, and remove duplicated codeRichard Moe Gustavsen2021-08-181-22/+1
| | | | | | | | | | | | | Let Button.qml inherit from DefaultButton.qml, since they share a lot of the same code. This then means we can remove a lot of the duplicated code. We will also get any bug fixes done to DefaultButton.qml for free, like ensuring that you can use Button together with custom background delegates. Task-number: QTBUG-95544 Change-Id: Ib6b3c04f22a74cf9a706843f20bba0bf6fae18f7 (adapted from commit 9738d49b65b63da2a) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* macOS: ensure that you can set a custom button backgroundRichard Moe Gustavsen2021-08-181-5/+4
| | | | | | | | | | | | | | | As it stood, the implicit size of a button would be empty if assigning it a custom background with an implicit size. This differs from the other styles. This patch will follow the same logic as in e.g the Fusion style, and use the maximum size of the background and the content item as the buttons implicit size. Task-number: QTBUG-95544 Change-Id: Ic868a5f78cfc7ea6b2dd00c84689c5ab24891121 (adapted from commit 20054ba885804e928) Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Unset mouseGrabberPopup if it's removed from childrenDavid Redondo2021-08-171-1/+4
| | | | | | | | | | | | | | | | | | | | The mouseGrabberPopup is supposed to be unset in handleRelease, however when the exit transition of the mouseGrabberPopup (that closed itself on button press) finishes before the release event is delivered, it unparents itself from the overlay (see QQuickPopupPrivate::finalizeExitTransition) and the overlay sets itself invisible if there is nothing else visible in it. Because the overlay is not visible it handles no events anymore and the release is missed and the grabber is never unset. When opening another non-modal popup the overlay then will continue forwarding the events to now invisible popup. So when the overlay loses the currently grabbing popup as a child we need to reset mouseGrabberPopup. Fixes: QTBUG-95259 Change-Id: I3c832d47f3cee216b81ef1b5cb7dd77bf4149991 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (adapted from commit d07ee1345acd8100fa5cbb7f05c0aaf5f87f4cae)
* Revert "ToolTip: use contentWidth of Text contentItem to account for newlines"Mitch Curtis2021-08-135-212/+4
| | | | | | | | | | | | This reverts commit a2b56c3661d76302e818864868e2dba656185b75. It causes QTBUG-94764. Task-number: QTBUG-83630 Task-number: QTBUG-94764 Change-Id: Ib27d827e25d4e4cea805d0f8e3c32b8aa843ec6a (adapted from commit 009a0262bc0436d4822a3438fc99e02ed15dfc69) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Revert "Allow creation of custom QQuickPopupItem-derived types"Mitch Curtis2021-08-138-175/+82
| | | | | | | | | | | | | This reverts commit 851acd642bf9d20c452286f9790f73925b64d173. The follow-up commit a063cd0be5e8f108a0084831856f4af8c0e9159c causes QTBUG-94764, so we don't need this enabling change for now. Task-number: QTBUG-83630 Task-number: QTBUG-94764 Change-Id: I1aec8571dcdcc2103d0e56c3d0bbfc4a4872d8db (adapted from commit b69d071c10dfa4c5d7b62692b8a9d7bb659a4ab5) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Windows: fix error in CheckBox.qml when hoveringMitch Curtis2021-07-141-1/+3
| | | | | | Change-Id: I897327d5f3bfd0ebbdca2df74ea43d6625c67a65 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit d8a1aac5651f346aa1df1cd912e33c1a82d41e42)
* Native style: Do not assertJan Arve Sæther2021-06-281-2/+4
| | | | | | | | | | | | When a component (e.g. Button) is used as a delegate in ListView, we might get a updatePolish() before the component is completed. Make sure we don't call polish() before we are completed. Fixes: QTBUG-93041 Change-Id: Iba5d1a4365c864f8ff8115383880500feac7bc5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0c2adb5652480f7546fadb78b652a09294c4e646) Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Windows: fix error in Button.qml when hoveringMitch Curtis2021-06-221-1/+3
| | | | | | | Fixes: QTBUG-92824 Change-Id: I261b269187b0106939837620287838222f8923b4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit e548d825aef388178147f27539b17cc8dc0d5e9a)
* Fix SwipeDelegate losing swipes to parent flickablesMitch Curtis2021-06-161-3/+4
| | | | | | | | | | | Use a smaller threshold than Flickable so that it doesn't steal our events. Fixes: QTBUG-55705 Change-Id: I7e985c27788818226a3158078d485ea12ddd7006 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 887af04857f366c393512573cafebccde2678d6d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: make it clear that Page doesn't render its title textMitch Curtis2021-06-161-0/+3
| | | | | | | | | This is demonstrated in the example, but it's better to make it clear. Change-Id: Ie5efcca2256da6a03d31df9cf045f4a97d1ad1ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 41766ac6d6e100b69d74c98edde60f0835b7da13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: some ComboBox functions must be used after component completionMitch Curtis2021-06-104-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | The internal QQmlDelegate model may not be ready until after componentComplete() is called. For example, the following code will print -1 for the find call, even though printing the model will show the "Hello" entry: ComboBox { id: comboBug anchors.centerIn: parent model: ["123", "BlaBla", "Hello", "Turtle"] currentIndex: { console.log("Model: " + comboBug.model) console.log("Find: " + comboBug.find("Hello")) return comboBug.find("Hello") } } Fixes: QTBUG-94257 Change-Id: I6e8c2a4eb8ca7ffca0a38d2f2e914cf791d3bd2e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 332011c8e6a96cd2b0c685b72f96337660f690e0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix MSVC warning C4065Kai Köhne2021-05-281-5/+8
| | | | | | | | | | | MSVC doesn't like it when there's only a default switch: qquickwindowsstyle.cpp(2284): warning C4065: switch statement contains 'default' but no 'case' labels Change-Id: I3d6072e88a3aeec3a6801c2b0ddffd8e9f511943 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit d298214d9356dc68b834ae605493728d0d8abe1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TextArea: Detach the flickable when it is deletedAndy Shaw2021-05-271-0/+4
| | | | | | | | | | | When the flickable is deleted before the TextArea is (which can happen when it is a child of a ScrollView) then we need to make sure that the TextArea no longer keeps a reference to the Flickable object. Fixes: QTBUG-93958 Change-Id: I1745065370718e60bc459192e15eae0e1ba36231 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4cba29c38cb1b610bf896130050b6c14b7e10c71)
* Sync the visibility of the FocusFrame with the target itemAndy Shaw2021-05-271-1/+1
| | | | | | | | Fixes: QTBUG-93994 Change-Id: Ib9138f6bc59bcf7b97d5ccb478c7b9c434dfef64 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 85a74d5cb68b11a1152b00d3e4a0e8dc9998b31c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-05-262-1/+11
| | | | | | | | | | | | Check if a Flickable type was actually set as the contentItem before accessing the pointer. Also warn that using a type other than Flickable is not supported. Fixes: QTBUG-93039 Change-Id: I1470766c6de02b7b601edf1375791d3147f26ab5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e7df2279bf5519703fd0b853abaa23947a599920) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Don't call QQml_setParent_noEvent with a nullptr itemVolker Hilsheimer2021-05-201-2/+2
| | | | | | | | | | | | | Since we check for item being nullptr just before it evidently can be, in which case QQml_setParent_noEvent would access that nullptr. Fixes issue raised by code checker in 23fe43ee0a0838e3b680f6dc55cd226e Change-Id: Ic5306c0c8d89734a606ab90addc6540621696553 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b2f4ee87d888941fd548d9a4009711d1c018073e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't access QStyleOption* without checking for nullptr firstVolker Hilsheimer2021-05-191-2/+2
| | | | | | | | | | | | It can be nullptr as per the preamble to the function, and the fact that the parameter defaults to nullptr. Addresses code checker report 723994a37c58a4dcc3aeb573e1d517c5. Change-Id: Id17c95314f4adfa48e7754120ecc36a2efac5403 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 4f9e977cdacd672724bfa615e6b7b18363c8c24c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Hide old scroll barsMitch Curtis2021-05-191-0/+16
| | | | | | | | | | Reuse the hideOldItem added in 80f1186338bcf8c7d692b4fadfc46531c002c6b0 to unparent and hide them. Fixes: QTBUG-89126 Change-Id: I641e46571b8ac42e0e5080b6737f305ff59afd51 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 908aa77d16e00f2bccc0ddae0f8b61955c56a6a1)
* Doc: apps that never set a style in Qt 5 should set Basic in Qt 6Mitch Curtis2021-05-121-0/+5
| | | | | | | | | | | This avoids surprises when moving to Qt 6, where the default style is now platform-dependent. Fixes: QTBUG-92158 Change-Id: I44cede00379b507f97ae7ac51aa5717c1b6510a8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2261054c490c60cf297adf684855a634826f5813) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allow creation of custom QQuickPopupItem-derived typesMitch Curtis2021-05-118-82/+175
| | | | | | | | | | | | This allows QQuickPopup-derived types to have their own QQuickPopup-derived popup item. This is useful for controlling e.g. implicit content item sizing. Task-number: QTBUG-83630 Change-Id: I279d2e39df9a9cff29b3015a2f5baae7128f461f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6b8a9673111bbf888990ce5904e176057ad4a71b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ToolTip: use contentWidth of Text contentItem to account for newlinesMitch Curtis2021-05-115-4/+212
| | | | | | | | | | | | | | | | | By default, QQuickPopupItem uses the implicitWidth of its contentItem, which is too large in the case of a ToolTip with newlines in the text. In that case, contentWidth refers to the width of the text including newlines, so we use that instead. [ChangeLog][Controls][ToolTip] The implicit width of ToolTips now accounts for newlines in the text. If you want to use the old behavior, set ToolTip's contentWidth to implicitContentWidth. Fixes: QTBUG-83630 Change-Id: I7ca3805429acb68a13ead8f3545bb84a51fb1b72 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a063cd0be5e8f108a0084831856f4af8c0e9159c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Qt Quick Calendar from overviewKai Köhne2021-05-111-4/+0
| | | | | | | | | The module is only available on marketplace Change-Id: I0910630b746b6eb4935fabdbc5148677c08bb234 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 468def83fc713e329ef9b2e150653837fe895159) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Imagine: fix GroupBox's bottom edge being clippedMitch Curtis2021-05-061-2/+1
| | | | | | | | | | | Use the actual padding from the nine patch image rather than the hard-coded 12. Fixes: QTBUG-91924 Change-Id: I4707ae173c088625657a135680619cf646e3a9e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 9a10ab40b7bc3db21f48ff004c5c5525cbfd40de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS, Slider: draw a focus rect, and not a focus ringRichard Moe Gustavsen2021-05-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | In the mac style, we draw the focus ring for a slider from QML around the handle. This has shown to be fragile, since UIKit doesn't draw the handle in the center of the rect we get when we query UIKit (using the [cell knobRectFlipped:slider.isFlipped]). And then the focus ring will be offset as well. While we could try to adjust the rect manually from QQuickMacStyle, this will only be quaranteed to work on top of the current macOS SDK (macosx11.1). So for that reason, this patch falls back to use the less correct, but more future safe, solution of drawng the focus ring as a rect around the handle instead. While this doesn't look native, it still looks better (and correct, for the uninformed) compared to an eliptic ring that is misplaced on the target. Fixes: QTBUG-93423 Change-Id: Ibc00f12f9606cd66c8ff384967aa3ea0d7727964 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit cad9ba218f04bc3de14a08e93bfa2ff33164e6fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: fix table of ComboBox's implicitContentWidthPolicy enum valuesMitch Curtis2021-05-051-3/+0
| | | | | | | | | Can't have newlines in there otherwise it breaks up the table. Change-Id: Ia64d94fc6d08dd6000b3663af030c8e5a7a7e3ef Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 47576dccadac1c56fd3b67d7d0cfcd53e5c8af7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: clarify sizing behavior of PageMitch Curtis2021-05-051-1/+14
| | | | | | | | | Items declared as children must be positioned and sized manually. Change-Id: Ie2b2989de07729464ae38b634992d53063ff739d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 58ae16f9d40b1edbd2369b3571a40d825819c758) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macOS: don't set Qt::StrongFocus on Sliders by defaultRichard Moe Gustavsen2021-05-041-0/+4
| | | | | | | | | | | | | On macOS, the sliders should not get focus from clicking (Qt::StrongFocus). Instead, it should follow the logic we already do for buttons (which includes checkboxes and radiobuttons), which uses Qt::TabFocus by default. Fixes: QTBUG-93430 Change-Id: I6d0d3d876a0b8c0e9cd9b23f12856090aa6a8173 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit db35ae0a75531b944a9f81d91b60582218fdfbcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickDial: Keep value integer if everything is integerFabian Kosmale2021-05-031-3/+31
| | | | | | | | | | | | | | | | | If a user uses integer values for stepSize, from and to in a Dial, they most likely want the actual values of the Dial to be integers, too. Detect this condition, and store it in a new boolean member. If the condition is met, we round the value in QQuickDialPrivate::valueAt (which, due to floating point math might not be an exact integer). As a drive-by, reorder the boolean members to introduce no additional space overhead. Fixes: QTBUG-92214 Change-Id: If4633fae1d7d425ca7fb767c7284d6f8ea7ce78c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 42687caf7bc7496b838995f3fa68194ca8323da3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update return type of local qHash overloadVolker Hilsheimer2021-04-281-1/+1
| | | | | | | | | The Qt 6 prototype returns size_t. Change-Id: Ic86b606fd125e3b2b9782462c4f929553513f6c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit bd5b9cae7a29cb20d6b0e782c76a27ae4ca2d8db) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: document the native stylesRichard Moe Gustavsen2021-04-288-0/+162
| | | | | | | | | | | This patch will add documentation for the native styles that was added to Qt 6.0. Fixes: QTBUG-88220 Change-Id: Ib0703b3758d48586cd8465ea9188691b9e377064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 30cf78d48f6a3778e8b4ec2e2b8924b25fdc85cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Avoid duplicate symbol errors due to a common resource nameAlexandru Croitor2021-04-271-1/+1
| | | | | | | | | | | | | | | | The macOS nativestyle plugin uses the 'qmake_immediate' resource name, which conflicts with any test / example that might create a resource with the same name. This is problematic in static builds because it causes duplicate symbol errors when linking. Use a different unique resource name instead. Fixes: QTBUG-93172 Change-Id: I29dee69190d75fe11c8993353349e3db2004d276 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit cc2d45fd72a764312be9757ef96cc9abd5d1b423) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix build without features.shortcutTasuku Suzuki2021-04-273-0/+7
| | | | | | | Change-Id: I871e115f27c3c43a9e9b2e23392cd1dcbfb0cec0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d184a72af73af0a3984ecac6179e3a5294838af4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Native style: fix statically built apps that links to both widgets and controlsRichard Moe Gustavsen2021-04-222-4/+24
| | | | | | | | | | | | | | | | | | | | | | | The c++ symbols are already namespaced into QQC2. But since there is no namespace concept in obj-c, we use QT_MANGLE_NAMESPACE to wrap those symbols into a "fake" namespace by concatinating symbol name and namespace name together. The problem is that QT_MANGLE_NAMESPACE only take the QT_NAMESPACE into account, and not the additional QQC2 namespace. The result is that the application will fail linking because of duplicate obj-c symbols when you combine widgets and controls in a statically linked application. This patch will redefine the affected macros locally in qquickmacstyle_mac, so that both the Qt namespace and the controls namespace are taken into account. Fixes: QTBUG-92883 Change-Id: Ic2f84ad9c0005fdd2553729d897cee113a4ff24d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit a372b35d93d4deb14ba9b855c49bcbd328b32381) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlDesigner: Fix RangeSliderSpecifics snap modeHenning Gruendl2021-04-211-1/+1
| | | | | | | | Task-number: QDS-4212 Change-Id: I82d524960a34e9307ddf9b154a326d8fadc7387c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit f42abbcb7794bcfc884e8aee75f73bd9ab8fbda4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-1619-19/+19
| | | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Task-number: QTBUG-92861 Change-Id: Ifd12d6309f358b9b72372a5c069141ecb7322bc7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 22e3b6d2292ded526354569a1ffb342a660f1f80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ninepatch: keep resetNode status to not lose track of ↵Laszlo Agocs2021-03-311-1/+6
| | | | | | | | | | | | | ImageNode->NinePatchNode changes Basically does what 788865b805bc91151ac8fe18bf7b92b1212ee07d did, but on the other branch. Fixes: QTBUG-87236 Change-Id: Ie8371de8a9d49054c888e4bffb7e89392a6d7c07 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 764b21987e36bc0734b7e8c9aab0e0d25771b56e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Consistently check for nullptrVolker Hilsheimer2021-03-251-1/+1
| | | | | | | | | | | | | Since delegateItem might be nullptr after the qobject_cast, it might still be nullptr even if d->tumbler is set. Don't dereference it without checking first. Fixes static analzyer warning 97aff83b6782555664df70d92f65e7dd. Change-Id: I70f4e27eaa5e26538884ead19ae12da7bacbd76b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 60b134d0d77a1eadf594eeab8d0cc7e85d7ce905) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle directly-delivered mouse events in SwipeDelegateShawn Rutledge2021-03-233-21/+130
| | | | | | | | | | | | | | | | | | Delivery order has changed to be the same as the z-axis stacking order (since qtdeclarative 3ff11ceca37dcc4b6f0420332fa7f6aa007be7f3). Since QQuickSwipeDelegate puts its children under itself by setting negative z-values, it can now receive mouse events before those negative-z children, directly rather than via childMouseEventFilter(). It doesn't seem to be enough to ignore() the events and let them propagate: we now need to explicitly forward them to interactive child items, and to child items' Attached objects, if any. Fixes: QTBUG-87018 Fixes: QTBUG-87789 Change-Id: I1e02ceddad7c3221fb09a33046941d654bfa8a4b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 69162120c735801905893f90bef38b49464f6bb9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Generate and install qmltypes for all pluginsMaximilian Goldstein2021-03-186-1/+7
| | | | | | | | Change-Id: Ib6f0aa7d2fe663f8d1ba090d2c62d57e0073a526 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 719cfa565566e3b9d384068d732eb8cacad24f8d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Change section titles that cause bad linksPaul Wicking2021-03-111-3/+3
| | | | | | | | | | | | Section titles are valid targets for QDoc's autolinker. When they are identical to other valid link targets, such as for example a class, these sections may cause invalid links. Task-number: QTBUG-91141 Change-Id: I466b2d21be030cd34b2a734d5126c45ff763127b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 5d76e666e3792230fe714676e3a1bc5c1e9ad926) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix static buildJoni Poikelin2021-03-091-1/+1
| | | | | | | | | | | Function with the same name is exported from QtQuick which leads to multiple definition linker error. Marking this function as static avoids the issue. Change-Id: I29f3923ee55b5181e9b76b91e49d9f753f54ed8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 02b18562fe1d6dec50e361a2ac568cb11087b743) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix namespaced Qt buildKarsten Heimrich2021-02-171-3/+3
| | | | | | | Change-Id: I688bdd73c939304f572d0e162e7aa09499bf737f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 57614bc6719c9e63e53ad0a484c554852ebff5f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove QMake project filesJoerg Bornemann2021-02-1134-2551/+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>
* a11y: Fix ordering on header, content item and footer in PageJan Arve Sæther2021-01-298-2/+230
| | | | | | | | | | | | | | | 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>
* Combobox: Fix initial set of inputMethodHintsBartlomiej Moskal2021-01-281-6/+15
| | | | | | | | | | | | | | | 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>
* Fix initial currentIndex in Tumbler when wrap is set to falseAlexey Edelev2021-01-141-2/+3
| | | | | | | | | | | | | | | 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>
* 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>