aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix test pathswip/qtquickcontrols2Mitch Curtis2021-08-0231-42/+43
| | | | | | | | | | | In preparation for merging into qtdeclarative Task-number: QTBUG-95173 Change-Id: I0c91c9af85ca63ca8c7f7184d41f299030e12a0e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 93b7b48d417ff0a7a77871454bf90d6962fe890c)
* Restructure tests in preparation for merging into qtdeclarativeMitch Curtis2021-08-021059-103/+105
| | | | | | | | | Task-number: QTBUG-95173 Change-Id: I541dc26cf2cdd6f2640824f693f7d059445367d9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f865f4b76d9385077c9ba4ca91a91246554dd36e) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Move dist files into dist/archived/qtquickcontrols2Mitch Curtis2021-08-0232-0/+0
| | | | | | | | | | | | In preparation for merging qtquickcontrols2 into qtdeclarative. Any future change logs for controls can use the same change file as declarative. Task-number: QTBUG-95173 Change-Id: Icf08e5f9c9dd5b88672db1defc54f47fe630bf66 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2baab6ba9aeafb15b4dadb16d707c45ebb1c2e14)
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-08-021-1/+1
| | | | | Change-Id: I1ac1ed393e9df18929baf5228ade36d4dbb5593b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-291-2/+2
| | | | | Change-Id: Id7186d2d990bc8fe3a1cfd950913b548c0c60ba9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-281-2/+2
| | | | | Change-Id: I94f43e927242cee7b6069cc9627ecd88b6f7b1a2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I034e0e225842d239b3210cbfbb72c1e249c178a2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I76f089d571369c29bfd0aefadecc13b5bd6745ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: Ie2407635741cc7474df1886358f680125590178d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: I6db1a944e7af79801b215f9160939fbe02b46d4e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I3a31914be16275b7fb9d0bfc4a394e116b2c142c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing QQuickControl testVolker Hilsheimer2021-07-221-0/+1
| | | | | | | Change-Id: Ifa7807c992156229fb805bdae4f553d921bfe8c1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 81f16aa16e64d55985fc2b199a86773ff2d6f125) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I1b92fd09fe9ade3a2f2cc301f669ba6047a769c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-211-2/+2
| | | | | Change-Id: Ia9093b73095a853c8105145c1307089c1676d7e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I2d5ad288537732cb0d4b9525854719d33602ffd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I2dd9c6d05fcfcfc1f232e60bdd5d75cc8e99c502 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* SplitView: document how to change handle touch area sizeMitch Curtis2021-07-192-0/+68
| | | | | | | | | | | Task-number: QTBUG-82678 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> (cherry picked from commit 43c34d3a92839b8592cd2e1dfc63d1e2fbbcc3ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-191-2/+2
| | | | | Change-Id: I356d1d31754a49c0020d2e4e9bcf9bf23ac5f72a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickFontDialog: Minor visual adjustments for universal and materialOliver Eftevaag2021-07-192-1/+4
| | | | | | | | | | | | | | | These changes are subjective, and might not be seen as an improvement by everyone. Personally, I felt that some space could be removed between the text fields and list views for the material style, and between the list views and group boxes for the universal style. Task-number: QTBUG-87799 Change-Id: I2a94caaa2304ccef0c9709bbfe9a0cd9b56e2034 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ef9e58808c42ad52b3481de342309d8c4e9e8ee9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unnecessary type registrtion function declarationsUlf Hermann2021-07-163-6/+0
| | | | | | | | | For auto-generated plugins we don't need the declarations. Change-Id: I0250703e7c81debc6bc6ca526722c43b8a8058c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit fd2a2808ac2c53220c907d7177aee0d172102859) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-161-2/+2
| | | | | Change-Id: I7cdf5904a6cfd4e874602c24fd92e1656c45287e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-151-2/+2
| | | | | Change-Id: I1c5a3be805855ec696fc3e784f5d1621bbbd1ef6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve visuals of non-native FontDialogsMitch Curtis2021-07-145-8/+11
| | | | | | | | | | | | | | | | | | - Specify preferredHeights directly on the items that need them rather than doing it at a higher level. This makes the lower row with the text edits and check boxes shorter, giving more space to the row with the list views. - Convert the ColumnLayout containing the check boxes into a RowLayout to save vertical space. - Add some spacing and padding where necessary now that everything is more compressed. Task-number: QTBUG-87799 Change-Id: Iba288f678c1d449ace3bc143073d216fe69d9d9a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e2f4afcedb857f22e80671b638a80245a09cb249) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-141-2/+2
| | | | | Change-Id: I9e865fc93db4ccbc75fa8301473d9be7e5fa127d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I2d1839a11d0bd3932a414b11a61a49c6c6fdc217 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I16fd208fb7ddda0b3632a2c9f3b2dda21af955c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix warning in RangeSlider::test_touchDragThreshold testMitch Curtis2021-07-121-1/+1
| | | | | | | | | | | | The warnings were: TypeError: Cannot assign to read-only property "first" TypeError: Cannot assign to read-only property "second" Change-Id: Ida6b0e4491f9ef867454b32c0ce1c4cd33dd841f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 87b512cdf417e3e2898bbd5b808b5b837f93b7d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-121-1/+1
| | | | | Change-Id: I115fce3fcbf51a5527177499702e439d4733c897 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-121-2/+2
| | | | | | Change-Id: Ia8163ed6c72754ba15af01addcd33c4711593c77 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: some ComboBox functions must be used after component completionMitch Curtis2021-07-124-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>
* Doc: make it clear that Page doesn't render its title textMitch Curtis2021-07-121-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>
* Fix tests due to QQuickItem::contains() function behavior changeIgor Bugaev2021-07-128-34/+42
| | | | | | | | | | A lot of tests broke because they used to rely on the behavior that you can send an event to an item on its right and bottom edge, and the ability to send an event to an item of zero size. Change-Id: I9c5883ddb327c751221b4f03bb9a699d69961d3a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 6ea8c21ccf1bf4f88361bc1ad99944b1cf38aba4)
* Adjust to QQuickItemPrivate::{width,height}Valid becoming a functionFabian Kosmale2021-07-1211-55/+55
| | | | | | | | | Task-number: QTBUG-94703 Change-Id: I2c48f1cc94b8dd94cddab1d833f62299d35fe5d9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 2a4ff847e8c018f31b14ecffd229d3793138ab1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_abstractbutton.qml: give buttons a sizeMitch Curtis2021-07-121-0/+4
| | | | | | | | | | | | | They're abstract hence not styled, so they won't have a size, and after the recent changes to qtdeclarative, will not receive events. Amends 6ea8c21ccf1bf4f88361bc1ad99944b1cf38aba4. Change-Id: Ic79777cb60fbe593f4c09bec98e6e0fec379cfb9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Igor Bugaev <freedbrt@gmail.com> (cherry picked from commit 983afd069a587ce2f5bb82c4d16a343ae98534a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Stabilize tst_QQuickPopup::macOS::activeFocusOnClose2Shawn Rutledge2021-07-121-0/+1
| | | | | | | | | The button starts out zero-size with macOS style. Change-Id: Ib960188c8103943c5466812de80785dd90353679 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f19ae5c9d7c6c4c321b9149c303c66b4d00c8064) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_qquickdrawer: parent should not be hovered when child is hoveredRichard Moe Gustavsen2021-07-121-1/+1
| | | | | | | | | | | | | | | | | | There are two ways of working with hover events in Quick; Either by using pointer handlers (typically from QML), or by using hover events (typically from c++). The former will currently always propagate hover events up the parent chain, while the latter will block propagation by default, unless the event handler rejects the event. Since the test in this patch is testing hover events, and not hover handlers, we should expect the parent (drawerItem) to not be hovered when the child (drawerButton) is hovered. Change-Id: Ia8fb8a29f7cefe07d4ec86db016e51f8d71ecb06 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 0ee5976cf25b9da0502368370b07d96914349ca0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Stabiliize tst_qquickpopup::hover() on macOSShawn Rutledge2021-07-121-0/+1
| | | | | | | | | | The popup seems to have a size of 1,1 for a short time with -style macOS, so just wait for it to expand before doing any hover testing. Change-Id: I87787d53c2fcaf0efe0625b2f132b5d8acfd19d1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 3cdf29334f6dba7c6d50be2524c8c67810c61391) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tst_splitview.qml: ensure hover events are sent to handlesMitch Curtis2021-07-121-1/+2
| | | | | | | | | Task-number: QTBUG-94968 Change-Id: I7bc4ef907097fe7b1517f9419942fbfe06a4cc62 Reviewed-by: Igor Bugaev <freedbrt@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b3d9dd9af3d867f9b5fad195d91c011618bb8c61) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Be sure to click outside the menu in tst_QQuickMenu::mouse()Shawn Rutledge2021-07-121-1/+2
| | | | | | | | | It seems that with Fusion style, the menu is somehow larger. Change-Id: I2270d5db3cdb89da36f31d5b49225c16e34f114f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 30de3b58bf26fdfa83efc8e2c61fbcc29f20ee33) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Stabilize tst_QQuickDrawer::Windows::slider(mouse)Igor Bugaev2021-07-121-0/+4
| | | | | | | | | Need to wait before and after mousePress for some reason Change-Id: I34a82341dee48492bb4215ee86887ccfc6afbec0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 6363bc8bfebdedad9f4b871f99c23c9b7b0e8bc7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQuickOverlay: Handle hover eventsFabian Kosmale2021-07-124-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. Change-Id: I2194fd8e832592efd5b7b9697412bdaeaea74b83 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 48da34f3d797f58b3eda9ed0a98aa1776d75d946) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-0919-97/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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. 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> (cherry picked from commit 9c30798a439e6a87b574472aca7a4e15107c6221) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't leak buttons in QQuickDialogButtonBoxUlf Hermann2021-07-051-0/+1
| | | | | | | | Fixes: QTBUG-94455 Change-Id: I8d8c82f3b10e5e755ac11924c335ee07ab08d4a6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry-picked from commit af4137ec20f0cd0e4f385cc5e7a7f2d0a87df6f7) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-301-2/+2
| | | | | Change-Id: I5d893db3932c28b159cf78a312476405d89b17da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-291-2/+2
| | | | | Change-Id: I2fdc71ac93bacf20ffcabbc7187056ca57121f3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation for msvc2019Igor Bugaev2021-06-294-5/+5
| | | | | | | | | | | | 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 Change-Id: If79d1b73d916472e2e82d15ebf423eac646fc76d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 184a5cc25f7c4a30c82a61848a0e62d9044041f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-261-2/+2
| | | | | Change-Id: I413665212df0798aa529cd3ef5090589c2a4f648 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-251-2/+2
| | | | | Change-Id: I1d5d564c7267615b8d1e35a0768fe204bff71ae5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-241-2/+2
| | | | | Change-Id: I8f5d74c20e446413af11bc4cf982f1e0a245a3d2 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-04-27 02:52:03 +0000