aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove qtquickcontrols2 sources and explain where they wentHEADdevMitch Curtis2021-08-164523-370724/+14
| | | | | | | | | | | | 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>
* Doc: Add missing QML module page for Qt Quick DialogsTopi Reinio2021-08-033-4/+52
| | | | | | | | And fix minor documentation issues. Pick-to: 6.2 Change-Id: I42f13e5662fb4e4127428b5e67a145ed22be4cfd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-281-2/+2
| | | | | Change-Id: I47bc8aa2cb5399e1c47678133a5124ad6038701e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-271-2/+2
| | | | | Change-Id: I663d071fa95400a89d1c0e0199fcdde0312e3b54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix test pathsMitch Curtis2021-07-2631-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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-241-2/+2
| | | | | Change-Id: I4976badd9d8cb4cc33f3a36a69aa5f120439c0e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-231-1/+1
| | | | | Change-Id: I57b7a298b6eab50345224a2852f0aff3a74a2da4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-231-2/+2
| | | | | Change-Id: I1327f0cc909dfc499ec78c352df3429be7ec2f23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I65e003b52e4ac05106a5f85419c7618b07084621 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing QQuickControl testVolker Hilsheimer2021-07-221-0/+1
| | | | | | Pick-to: 6.2 6.1 Change-Id: Ifa7807c992156229fb805bdae4f553d921bfe8c1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Restructure tests in preparation for merging into qtdeclarativeMitch Curtis2021-07-221059-102/+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>
* Move dist files into dist/archived/qtquickcontrols2Mitch Curtis2021-07-2232-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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-221-2/+2
| | | | | Change-Id: I7ca29bf11237a28f6e8575df69e9dfb0d66ae88f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-211-2/+2
| | | | | Change-Id: Ib76d67c078da44f00e2ac0d9f29f3fa998fc6e41 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* gifs manual test: use cmake qt_internal_add_manual_testShawn Rutledge2021-07-201-1/+1
| | | | | | | Unknown CMake command "qt_add_test" Change-Id: I4a9e22d06da89968dcd9bbe22be6864f800deb15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-201-2/+2
| | | | | Change-Id: I7a6fc96b85cfd6e95b626d00885b4ee3df5e96eb 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 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>
* 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 Pick-to: 6.2 Change-Id: I2a94caaa2304ccef0c9709bbfe9a0cd9b56e2034 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-191-2/+2
| | | | | Change-Id: I343bca5d4f18800044bb71c41cc10e465f41ed94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-181-2/+2
| | | | | Change-Id: I4da221818afa2b86a8fa6455c3d6ec7bbe91a67a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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. Pick-to: 6.2 Change-Id: I0250703e7c81debc6bc6ca526722c43b8a8058c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-161-2/+2
| | | | | Change-Id: I37046c7967bb51f3d7202a8df0729bdcd3e07845 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-151-2/+2
| | | | | Change-Id: I9c86d87fa35e3a53914a96db4842169388148f76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-141-2/+2
| | | | | Change-Id: Ieaa5f16945a7400b26ec06b51b9eef762b3c0df8 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 Pick-to: 6.2 Change-Id: Iba288f678c1d449ace3bc143073d216fe69d9d9a Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-141-2/+2
| | | | | Change-Id: Ib3e43ab10458a97efe6d473e9022990ae313af72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-131-2/+2
| | | | | Change-Id: I6bd93fe4168e3865d80a1b8a1f76d0fb0e609c92 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" Pick-to: 6.2 Change-Id: Ida6b0e4491f9ef867454b32c0ce1c4cd33dd841f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-121-2/+2
| | | | | Change-Id: I6b9555d1a1624cdbfda99b0fb347e72975d46b3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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. 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>
* Update README.md to inform about the macOS and Windows stylesRichard Moe Gustavsen2021-07-091-0/+2
| | | | | Change-Id: Idb58f5aee5d14031b5c5acfc51087c88fbb9c5a1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-091-2/+2
| | | | | Change-Id: Id1a55b8e3f1d247968d774524ba42f5f3a23d815 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-081-2/+2
| | | | | Change-Id: I5817628512dfc5657ae7329ed7c6b17240054963 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Stabilize tst_QQuickPopup::macOS::activeFocusOnClose2Shawn Rutledge2021-07-071-0/+1
| | | | | | | | The button starts out zero-size with macOS style. Pick-to: 6.2 Change-Id: Ib960188c8103943c5466812de80785dd90353679 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Stabiliize tst_qquickpopup::hover() on macOSShawn Rutledge2021-07-071-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. Pick-to: 6.2 Change-Id: I87787d53c2fcaf0efe0625b2f132b5d8acfd19d1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Be sure to click outside the menu in tst_QQuickMenu::mouse()Shawn Rutledge2021-07-071-1/+2
| | | | | | | | It seems that with Fusion style, the menu is somehow larger. Pick-to: 6.2 Change-Id: I2270d5db3cdb89da36f31d5b49225c16e34f114f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_splitview.qml: ensure hover events are sent to handlesMitch Curtis2021-07-071-1/+2
| | | | | | | | Task-number: QTBUG-94968 Change-Id: I7bc4ef907097fe7b1517f9419942fbfe06a4cc62 Pick-to: 6.2 Reviewed-by: Igor Bugaev <freedbrt@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_abstractbutton.qml: give buttons a sizeMitch Curtis2021-07-071-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. Pick-to: 6.2 Change-Id: Ic79777cb60fbe593f4c09bec98e6e0fec379cfb9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Igor Bugaev <freedbrt@gmail.com>
* tst_qquickdrawer: parent should not be hovered when child is hoveredRichard Moe Gustavsen2021-07-071-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. Pick-to: 6.2 Change-Id: Ia8fb8a29f7cefe07d4ec86db016e51f8d71ecb06 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
* Stabilize tst_QQuickDrawer::Windows::slider(mouse)Igor Bugaev2021-07-071-0/+4
| | | | | | | | Need to wait before and after mousePress for some reason Pick-to: 6.2 Change-Id: I34a82341dee48492bb4215ee86887ccfc6afbec0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Adjust to QQuickItemPrivate::{width,height}Valid becoming a functionFabian Kosmale2021-07-0711-55/+55
| | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-071-2/+2
| | | | | Change-Id: I0ca82dd359d1d0142ae44d785661e0c937f80e17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-07-011-1/+1
| | | | | Change-Id: Ieb5d880731ca4ecd82a7da84959bde7781aaef30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix tests due to QQuickItem::contains() function behavior changeIgor Bugaev2021-06-308-34/+40
| | | | | | | | | | 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. Pick-to: 6.2 Change-Id: I9c5883ddb327c751221b4f03bb9a699d69961d3a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 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 Pick-to: 6.2 Change-Id: If79d1b73d916472e2e82d15ebf423eac646fc76d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-291-2/+2
| | | | | Change-Id: I12acabc565fa4c4a47b9a7d8f4c3339422fb210a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-281-1/+1
| | | | | Change-Id: I78a6b560f3898f2dade3fb80724839ab02b73915 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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. Pick-to: 6.1 6.2 Fixes: QTBUG-93041 Change-Id: Iba5d1a4365c864f8ff8115383880500feac7bc5d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-06-261-2/+2
| | | | | Change-Id: Ic4bbee26b9990e770aae597987134b6f64d93cf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>