aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2
Commit message (Collapse)AuthorAgeFilesLines
* Remove qtquickcontrols2 sources and explain where they wentHEADdevMitch Curtis2021-08-16190-57584/+0
| | | | | | | | | | | | Now that qtquickcontrols2 has been merged into qtdeclarative, we should make it obvious that this repo should no longer be used, by preventing it from being built. Task-number: QTBUG-95173 Pick-to: 6.2 Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* SplitView: document how to change handle touch area sizeMitch Curtis2021-07-191-0/+5
| | | | | | | | | | Task-number: QTBUG-82678 Pick-to: 6.2 Change-Id: Icf0f43454086a059e8e14a03db985e570233e0a9 Reviewed-by: Igor Bugaev <freedbrt@gmail.com> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-091-4/+1
| | | | | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. As a drive-by fix, remove Qt::Foo dependencies that are already implied by Qt::FooPrivate. Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: I3f33766612367520e09e599f03ac06d43613aa81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QQuickOverlay: Handle hover eventsFabian Kosmale2021-07-074-0/+39
| | | | | | | | | | | | | | | | | With recent changes to hover handling logic, hover events would have been sent to the "main window", even if a popup were modal. As this is unwanted (a modally blocked button should not auto-raise when hovered), we now prevent delivery of those events in QQuickOverlay and overlayEvent. The logic is the same as for mouse and touch events: If we get a matching event, we ask the popup to handle it. The popup then uses the existing blockInput logic to decide whether the event should be blocked or forwarded. Pick-to: 6.2 Change-Id: I2194fd8e832592efd5b7b9697412bdaeaea74b83 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Adjust to QQuickItemPrivate::{width,height}Valid becoming a functionFabian Kosmale2021-07-0710-54/+54
| | | | | | | | Task-number: QTBUG-94703 Pick-to: 6.2 Change-Id: I2c48f1cc94b8dd94cddab1d833f62299d35fe5d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* Fix compilation for msvc2019Igor Bugaev2021-06-291-1/+1
| | | | | | | | | | | The Visual Studio 2019 (16.8), marks construction function(var */*name*/) as warning, but compiler flag /WX marks warnings as errors, and because of this, it's not possible to compile this module. This issue fixed in Visual Studio 16.9 Pick-to: 6.2 Change-Id: If79d1b73d916472e2e82d15ebf423eac646fc76d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove old configure-related filesJoerg Bornemann2021-06-171-28/+0
| | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ie6c3d946a7157164c3854ef22812262aa7237c4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QQuickComboBox: fix acceptableInput being wrong if no validator was setOliver Eftevaag2021-06-171-3/+27
| | | | | | | | | | | | | | | | | | This patch fixes an issue with hasAcceptableInput(), if the property would be read before the contentItem had been set by the qml engine. This would cause hasAcceptableInput to return false by default, even though the default value is supposed to be true, if no validators or inputMasks are being used. The solution that I've chosen, is to give the QQuickComboBox its own acceptableInput variable, and connect the contentItem's acceptableInputChanged() signal to a function that polls for the contentItem property, and updates its variable accordingly. Fixes: QTBUG-94307 Pick-to: 6.2 6.1 5.15 Change-Id: I587d76162e75544a7ed1df9e3b9104bd73013bb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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 Pick-to: 5.15 6.1 6.2 Change-Id: I7e985c27788818226a3158078d485ea12ddd7006 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add recursion guard to QQuickApplicationWindowPrivate::relayout()Jan Arve Sæther2021-06-161-1/+4
| | | | | | | | | | | | | relayout() might change the size of the header, footer or contentitem When one of those items changes, QQuickApplicationWindowPrivate will get notified by that through QQuickApplicationWindowPrivate::itemGeometryChanged(). itemGeometryChanged() will then call relayout()... (*recursed*). Pick-to: 5.15 6.2 Task-number: QTBUG-87708 Change-Id: I9403952e776afb2be37d009642c65b5520c79341 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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. Pick-to: 5.15 6.1 6.2 Change-Id: Ie5efcca2256da6a03d31df9cf045f4a97d1ad1ed Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickPopup: finalizeExitTransition before deleting internalsUlf Hermann2021-06-151-4/+5
| | | | | | | | Otherwise they get re-created and leak. Pick-to: 6.2 Change-Id: Ib6af70bed196d3b32faa1df7f40063a38e321987 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Don't leak buttons in QQuickDialogButtonBoxUlf Hermann2021-06-111-0/+1
| | | | | | Fixes: QTBUG-94455 Change-Id: I8d8c82f3b10e5e755ac11924c335ee07ab08d4a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix build without features.quick-tableviewTasuku Suzuki2021-06-111-2/+6
| | | | | Change-Id: I6b96d3d196b6d48e6dd53c74eb021e72840ac6be Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: some ComboBox functions must be used after component completionMitch Curtis2021-06-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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 Pick-to: 6.1 6.2 Change-Id: I6e8c2a4eb8ca7ffca0a38d2f2e914cf791d3bd2e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* doc: move the SelectionRectangle snippet to correct the placeRichard Moe Gustavsen2021-06-101-3/+3
| | | | | | | | | | After the cmake changes that restructured the repository, the snippets are now located in a different place. Update the documentation for SelectionRectangle to reflect this, and correct some related documentation issues at the same time. Change-Id: I4860973bf101dc6c2dce5f64822235f0b5b73ce6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* AbstractButton: emit doubleClicked() for touch eventsMitch Curtis2021-06-0916-121/+150
| | | | | | | | | [ChangeLog][Controls][AbstractButton] doubleClicked() is now also emitted for touch events. Fixes: QTBUG-82146 Change-Id: Ie1e24d291bd4b592edd91fc762da8636e08698df Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add new control: SelectionRectangleRichard Moe Gustavsen2021-06-065-0/+797
| | | | | | | | | | | | | | | | | | This patch will add a SelectionRectangle to controls. A SelectionRectangle can be used together with TableView to let the user select cells using either pointer Drag or PressAndHold. It lets the developer set their own handle delegates, or simply use the included ones added to the Basic style. [ChangeLog][Controls][SelectionRectangle] A SelectionRectangle has been added to Controls. A SelectionRectangle can be used to make selections in TableView. Fixes: QTBUG-74750 Change-Id: Ia7af578c1c905b0e92df193d7820ad6ef2c9b697 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update to latest qml CMake APICraig Scott2021-06-054-21/+242
| | | | | | | | | | | | | | The new qml CMake API places a closer relationship between the backing target and the plugin target. Both are typically created together and they share a lot of common details. Instead of creating them in different parts of the source tree, they are now specified together. The src/imports area has effectively been absorbed into the other corresponding subdirectories below src with this change. Task-number: QTBUG-91621 Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix FINAL warningMitch Curtis2021-06-035-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | An example of the warning: "Final member contentWidth is overridden in class QQuickPage. The override won't be used." - Remove FINAL from base class properties that are overridden by subclasses where it's not clear if it would be safe to not override those properties - Everywhere else, stop redeclaring properties in subclasses. This will result in e.g. MenuBar not having a contentWidth property if the QML is importing version 2.4, but as we're now long past that version, it should be fine. This fixes some auto tests that were failing after ba2928c787cf0988a7f6a7d424faea96ff707846. [ChangeLog][Important Behavior Changes] QML code that imported version 2.4 or earlier will no longer be able to access contentWidth and contentHeight in types derived from Container (i.e. MenuBar, etc.). Fixes: QTBUG-94180 Change-Id: I3cdb79de8a1b54ab0c78ad661c432c47d5d1dfc6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Adjust to bindable QQuickItem propertiesFabian Kosmale2021-06-032-3/+3
| | | | | | | | | | This prepares for QQuickItem's properties becoming bindable, changing the type of QQuickItemPrivate::{x, y, width, height}. It adds explicit casts/types where implicit conversion or type deduction would fail after the conversion. Change-Id: I9e25b45d1c7de162c3e72e8ec337b198bfd29c57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add a foreign registration for QQuickColorGroupUlf Hermann2021-06-011-0/+8
| | | | | | | | | | It has aqcuired revisioned properties. Task-number: QTBUG-33179 Change-Id: I31ce4b07649ccc20789ed15bfb50e1643f6e4bff Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix MSVC warning C4267Kai Köhne2021-05-281-1/+1
| | | | | | | | | | | | | | | | | C4267: 'argument': conversion from 'size_t' to 'const Key', possible loss of data in deferredStates()->insert(qHash(object, property), state); and QQmlComponentPrivate::DeferredState *state = deferredStates()->take(qHash(object, property)); The return type of qHash got changed to size_t in commit bd5b9cae7a29 Change-Id: If11de4fcd29a4d6ac8104e55ce18dd82f372054e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add QtQuick.DialogsMitch Curtis2021-05-2711-30/+61
| | | | | | | | | | [ChangeLog][QtQuickDialogs] Added FileDialog. This is a native FileDialog on platforms that support it, and a non-native Qt Quick FileDialog on platforms that don't. Fixes: QTBUG-87797 Change-Id: Ia3a98b616479b818c96c232a0329750023079642 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Revert "AbstractButton: set automatically as checkable when being checked"Alexander Akulich2021-05-261-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8ba12ed7f25d8cfb7619b6eb0a26fe4ae3e823b1. The referenced commit was introduced to simplify buttons setup: Button { checked: true } Button { checkable: true } With the commit the first button becomes 'checkable' automatically. However, the implemented behavior violates the principle of least surprise, listed in "API Design Principles". The following checkbox will be checkable despite of the explicitly set properties: CheckBox { checked: true checkable: false } This is a "surprising" behavior which makes some rare and already complex use-cases unnecessarily complicated. The save of explicit "checkable: true" does not justify the surprice and the ugliness of the code needed to overcome the forced checkable property if needed. [ChangeLog][Important Behavior Changes] Setting the AbstractButton's 'checked' property to 'true' does not automatically set its 'checkable' to true anymore. Fixes: QTBUG-93807 Change-Id: Ia35138ee6a09bb9f361f52a84e53578b0b6e57e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix layout is always RTL when locale is RTLHyunkook Khang2021-05-262-12/+9
| | | | | | | | | | | | | | | | isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* TextArea: Detach the flickable when it is deletedAndy Shaw2021-05-261-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 Pick-to: 6.1 5.15 Change-Id: I1745065370718e60bc459192e15eae0e1ba36231 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Don't call QQml_setParent_noEvent with a nullptr itemVolker Hilsheimer2021-05-191-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 Pick-to: 6.1 5.15 Change-Id: Ic5306c0c8d89734a606ab90addc6540621696553 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Hide old scroll barsMitch Curtis2021-05-191-0/+16
| | | | | | | | | | Reuse the hideOldItem added in 80f1186338bcf8c7d692b4fadfc46531c002c6b0 to unparent and hide them. Fixes: QTBUG-89126 Pick-to: 6.1 5.15 Change-Id: I641e46571b8ac42e0e5080b6737f305ff59afd51 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* 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 Pick-to: 6.1 5.15 Change-Id: I279d2e39df9a9cff29b3015a2f5baae7128f461f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* 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 Pick-to: 6.1 5.15 Change-Id: I7ca3805429acb68a13ead8f3545bb84a51fb1b72 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Slider: Fix broken NoSnap and SnapOnRelease modeJonas Karlsson2021-05-071-1/+1
| | | | | | | | | | A NoSnap and SnapOnRelease mode should always update the sliders position even if the value is not updated. Fixes: QTBUG-76136 Change-Id: I6cf6f948bfe582acc7f105373fb1938353acf2e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* 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. Pick-to: 6.1 Change-Id: Ia64d94fc6d08dd6000b3663af030c8e5a7a7e3ef Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: clarify sizing behavior of PageMitch Curtis2021-05-051-1/+14
| | | | | | | | Items declared as children must be positioned and sized manually. Pick-to: 6.1 Change-Id: Ie2b2989de07729464ae38b634992d53063ff739d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* 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 Pick-to: 6.1 6.0 Change-Id: I6d0d3d876a0b8c0e9cd9b23f12856090aa6a8173 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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. Pick-to: 6.1 5.15 Fixes: QTBUG-92214 Change-Id: If4633fae1d7d425ca7fb767c7284d6f8ea7ce78c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update return type of local qHash overloadVolker Hilsheimer2021-04-281-1/+1
| | | | | | | | The Qt 6 prototype returns size_t. Pick-to: 6.1 Change-Id: Ic86b606fd125e3b2b9782462c4f929553513f6c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Remove GENERATE_METATYPES usageMaximilian Goldstein2021-04-271-1/+0
| | | | | | | We now generate metatypes by default and every instance of GENERATE_METATYPES now causes a warning. Change-Id: I691d0a3973c47cab666bd4ca948b2afe047ee13f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix build without features.shortcutTasuku Suzuki2021-04-271-0/+4
| | | | | | Change-Id: I871e115f27c3c43a9e9b2e23392cd1dcbfb0cec0 Pick-to: 6.1 6.0 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix build without features.quicktemplates2-hoverTasuku Suzuki2021-04-261-1/+1
| | | | | Change-Id: I02096558d480dcef456f9cd1e86c7c843179758c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-232-1/+10
| | | | | | | | | | | 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 Pick-to: 6.1 6.0 5.15 Change-Id: I1470766c6de02b7b601edf1375791d3147f26ab5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Add missing qt_cmdline.cmake filesAlexandru Croitor2021-04-161-0/+0
| | | | | | | | Generated with configurejson2cmake.py Change-Id: Ib07d883b94462f6e132f36c24e763b31309aaeed Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-151-1/+1
| | | | | | | | | | | 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. Pick-to: 6.1 6.0 Task-number: QTBUG-92861 Change-Id: Ifd12d6309f358b9b72372a5c069141ecb7322bc7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Include qquickpalette_p.h from qquickcontrol_p.hUlf Hermann2021-03-261-0/+1
| | | | | | | | The QML_FOREIGN declaration for QQuickPalette is not very useful if including it doesn't actually get you the type. Change-Id: Ia5face462112f9cccff4622e2bc6fd369ce204c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Adjust to QV4Engine::toVariant signature changeFabian Kosmale2021-03-262-2/+2
| | | | | Change-Id: I82aa23bf35cb611978939fcbda8baf9520fc2f32 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: Use \qmldefault instead of \defaultPaul Wicking2021-03-238-8/+8
| | | | | | Task-number: QTBUG-81525 Change-Id: I1b79fde191bfe0ac11778baf352409ace4cd5a56 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* 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. Pick-to: 6.0 6.1 Fixes: QTBUG-87018 Fixes: QTBUG-87789 Change-Id: I1e02ceddad7c3221fb09a33046941d654bfa8a4b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Consistently check for nullptrVolker Hilsheimer2021-03-191-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. Pick-to: 6.1 Change-Id: I70f4e27eaa5e26538884ead19ae12da7bacbd76b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove references to Q_QML_PRIVATE_API_VERSIONFabian Kosmale2021-03-192-12/+0
| | | | | | Change-Id: I476fd6dc9bb87dc95265bd92dbb6beeb684644f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Port from QScopedPointer to std::unique_ptrVolker Hilsheimer2021-03-172-3/+3
| | | | | | | Fix compiler warning about deprecated QScopedPointer::take. Change-Id: I7300e0a4eab5fca101b8b3127abf12e88359a5ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 20:41:33 +0000