aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Do not keep QML engines alive across qmlClearTypeRegistrations()Ulf Hermann2021-06-171-1/+2
| | | | | | | | | | Otherwise the builtins don't get re-registered afterwards. Fixes: QTBUG-94575 Pick-to: 6.2 Change-Id: I7fa4965d5147adf0cc437d1b6102815cc206a6ea Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQuickComboBox: fix acceptableInput being wrong if no validator was setOliver Eftevaag2021-06-171-0/+40
| | | | | | | | | | | | | | | | | | 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>
* Use the added placeHolderText color available in PaletteAndy Shaw2021-06-174-0/+4
| | | | | | | | | | This allows it to pick up the Palette's placeHolderText color by default while still using the property if it is overridden with that. Pick-to: 6.2 Task-number: QTBUG-93746 Change-Id: Ie6af95d6c60fa80f2789c2acd5964b5a347194ce Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix tst_palette by setting inactive color groupVolker Hilsheimer2021-06-161-0/+5
| | | | | | | | | | | Same colors as active, so that the binding test passes without having to wait for the window to become active. That's not what that test cares about. Fixes: QTBUG-94553 Pick-to: 6.2 Change-Id: I7b3cfb16ff6f64703faee0b2c90183af831390e5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix SwipeDelegate losing swipes to parent flickablesMitch Curtis2021-06-161-5/+35
| | | | | | | | | | 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-162-0/+103
| | | | | | | | | | | | | 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>
* Blacklist some flaky tst_qquickpopup functions on openSUSEMitch Curtis2021-06-161-0/+9
| | | | | | | Task-number: QTBUG-94251 Pick-to: 5.15 6.1 6.2 Change-Id: I5f06bba2522c07a29897501932c02b87e9cae356 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Blacklist some flaky tst_qquickdrawer functions on openSUSEMitch Curtis2021-06-161-0/+8
| | | | | | | Task-number: QTBUG-77946 Pick-to: 5.15 6.1 6.2 Change-Id: I11f3e275d76833754a994d1bf09e50fa1328828c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qquickpopup: Don't leak created objectsUlf Hermann2021-06-151-1/+2
| | | | | Change-Id: Ie1359fb407088adcc91b45ae18c682dda8822a67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix warnings in some testsMitch Curtis2021-06-144-30/+29
| | | | | | | | | | | | | | The warnings were all along the lines of: TestCase.qml:672: Error: Cannot assign [undefined] to double At some point the behavior was changed so that you can no longer pass undefined to initial property values, so account for that by having the data rows construct the properties object directly. Pick-to: 6.2 6.1 5.15 Change-Id: I7180e9fc664650b87ae0305b7f829cd7266be1ab Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* AbstractButton: emit doubleClicked() for touch eventsMitch Curtis2021-06-096-0/+55
| | | | | | | | | [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>
* Stabilize tst_qquickpopupFabian Kosmale2021-06-092-22/+33
| | | | | | | | | | | - Give the window system some time to change the cursor - Wait for popups to be properly opened and closed Task-number: QTBUG-94251 Change-Id: Ie380312daddcb2ee95f337c321ca2724c3b9f182 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add new control: SelectionRectangleRichard Moe Gustavsen2021-06-061-0/+311
| | | | | | | | | | | | | | | | | | 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-0529-31/+32
| | | | | | | | | | | | | | 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>
* Add FontDialog to QtQuick.DialogsOliver Eftevaag2021-06-045-0/+629
| | | | | | | | | | | Adding non-native FontDialog to QtQuick. This is a native FontDialog on platforms that support it, and a non-native Qt Quick FontDialog on platforms that don't. Fixes: QTBUG-87799 Change-Id: I43a59e3668a8a40f1d0c04a3c2506283d552a22b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QtQuick.DialogsMitch Curtis2021-05-2715-0/+1978
| | | | | | | | | | [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-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-267-56/+73
| | | | | | | | | | | | | | | | 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/+15
| | | | | | | | | | | 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>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-221-2/+2
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ie638443a76623df0ec20fbcd5485af59866deee6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Hide old scroll barsMitch Curtis2021-05-192-0/+65
| | | | | | | | | | 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>
* ToolTip: use contentWidth of Text contentItem to account for newlinesMitch Curtis2021-05-111-0/+18
| | | | | | | | | | | | | | | | 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-30/+44
| | | | | | | | | | 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>
* QQuickDial: Keep value integer if everything is integerFabian Kosmale2021-05-031-0/+15
| | | | | | | | | | | | | | | | 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>
* QQuickApplicationHelper: error-check after createWithInitialPropertiesMitch Curtis2021-04-271-1/+1
| | | | | | | | Unlike create(), it does produce errors that will not always be noticeable if we don't check for them. Change-Id: Ia3adad6937de5f9b923e0e1593486b8ae11c3c68 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-231-0/+24
| | | | | | | | | | | 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>
* Add initialProperties argument to QQuickApplicationHelperMitch Curtis2021-04-221-2/+3
| | | | | | | This allows setting required properties on loaded QML components. Change-Id: I9737cf85fac027077df234a02f81f5499e0cb6b5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add findViewDelegateItem function to visualtestutils.hMitch Curtis2021-04-2227-1/+65
| | | | | | | | | | This helper function finds an item view delegate instance at a given index, ensuring that the view is polished and positioned at the correct index if necessary. Change-Id: Ib133914df723251835be3812c1d0654c07a99f14 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Add clickButton and doubleClickButton functions to visualtestutils.hMitch Curtis2021-04-222-0/+79
| | | | | | | | | These helper functions save the hassle of calculating the click position within the window manually, and do a lot of other sanity checks in addition. Change-Id: I8cb53fab9c1addea15e8066e347a5c4af2700c2e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Don't include unused headerVolker Hilsheimer2021-04-121-1/+0
| | | | | | | | Fix compiler warning, runTests was not used. Pick-to: 6.1 Change-Id: I7ded597e992723eca2366cecfd7e231b417fc947 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Handle directly-delivered mouse events in SwipeDelegateShawn Rutledge2021-03-236-97/+3
| | | | | | | | | | | | | | | | | 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>
* Binary compatibility file for Qt 6.0.0 added for QtQuickControls2Milla Pohjanheimo2021-03-221-0/+14468
| | | | | | | | Binary compatibility file added. Pick-to: 6.0 6.1 Change-Id: I72aecee565c3cb2e6726a401e37f8fef1763c63a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove references to Q_QML_PRIVATE_API_VERSIONFabian Kosmale2021-03-191-4/+0
| | | | | | Change-Id: I476fd6dc9bb87dc95265bd92dbb6beeb684644f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add override keyword in tests to silence compiler warningsVolker Hilsheimer2021-03-171-3/+3
| | | | | | Pick-to: 6.1 Change-Id: I23374064c7ebc801d8b5082aa6663ed7c0c43813 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Port from QScopedPointer to std::unique_ptrVolker Hilsheimer2021-03-171-1/+1
| | | | | | | Fix compiler warning about deprecated QScopedPointer::take. Change-Id: I7300e0a4eab5fca101b8b3127abf12e88359a5ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix compiler warnings, add overrideVolker Hilsheimer2021-03-178-9/+9
| | | | | Change-Id: I547e94213f4b4d2c3ca3aeaa06330069e6311043 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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>
* ComboBox: don't focus TextField when clicking on indicatorBartlomiej Moskal2021-02-161-6/+25
| | | | | | | | | | | | | | | | 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>
* Remove QMake project filesJoerg Bornemann2021-02-1142-688/+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>
* 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>
* a11y: Fix ordering on header, content item and footer in PageJan Arve Sæther2021-01-293-1/+56
| | | | | | | | | | | | | | | 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-0/+1
| | | | | | | | | | | | | | | 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>
* Fix initial currentIndex in Tumbler when wrap is set to falseAlexey Edelev2021-01-141-0/+21
| | | | | | | | | | | | | | | 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>
* SwipeDelegate: ensure background and contentItem are resizedMitch Curtis2021-01-141-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fix popups with exit transitions blocking mouse events when destroyedMitch Curtis2021-01-132-0/+144
| | | | | | | | | | | | | | | | | | | | | | 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-132-1/+6
| | | | | | | | | | | | | 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>
* Reset the opacity and scale properties after the exit transitionAndy Shaw2021-01-061-0/+50
| | | | | | | | | | | | | | | By resetting the opacity and scale properties after an exit transition we are ensuring that it does not lose the original values that the user may have set. [ChangeLog][Important Behavior Changes][Popup] After the exit transition is finished, then the opacity and scale properties will be reset to their values before the enter transition is started. Pick-to: 5.15 Fixes: QTBUG-87283 Change-Id: I2b192c96eaea2906d968341255e80cd19be177e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>