aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-071-1/+1
| | | | | Change-Id: Ibcaed038988f3ec752d9f0be61bf74923bd61d0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-071-1/+1
| | | | | Change-Id: Iffa0660b74173f07b95d46f84fa5aaa201c61efa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-071-1/+1
| | | | | Change-Id: I050a91c0f8f5e5ea9017c5398fe02cb7b0fd5ccd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-071-1/+1
| | | | | Change-Id: I6d6d0b21d154e9ffc437dd05ef1aa11cc80f4529 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-061-1/+1
| | | | | Change-Id: Ie53c09ed2470978b455185b7615db68c8a2a0680 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-061-1/+1
| | | | | Change-Id: I65a11d8ed937d256c10526364a5f2f469f913f5c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reset the opacity and scale properties after the exit transitionAndy Shaw2021-01-064-4/+76
| | | | | | | | | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-061-1/+1
| | | | | Change-Id: I5c7c0ea31146045fa0691ba546eff96358612a3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-061-1/+1
| | | | | Change-Id: I84a5c1e6def1126ca1d16f2750748fd917177682 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-061-1/+1
| | | | | Change-Id: I1a3e3d488ba2b2a67a2177d9a87e0f8f94845caf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-051-1/+1
| | | | | Change-Id: I2f59b912e93949114ad4622ae37f38b2f5a9bc82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-051-1/+1
| | | | | Change-Id: I5b21e1e93a9c2f1daecff1deb7e3a8f718162af7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Document that styles must be explicitly imported for static buildsMitch Curtis2021-01-052-1/+4
| | | | | | | Task-number: QTBUG-52466 Pick-to: 6.0 Change-Id: Ibf5c6f4079381c5ac507812f97439dbb49ada074 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-041-1/+1
| | | | | Change-Id: Iff3e8a39373667144ba8dce619cf773658428b10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-041-1/+1
| | | | | Change-Id: I053faaafc457d1169db1ff90ed16d87cbee71988 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-041-1/+1
| | | | | Change-Id: Ice052a321ad0edcc2b51ddc04f08b30eb0737e82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-01-011-1/+1
| | | | | Change-Id: I61228eef7bf9087c28764a190ce3d5fb69896f69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-311-1/+1
| | | | | Change-Id: Iaa9991698ddde7781d443595ebcd116b091a7938 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-311-1/+1
| | | | | Change-Id: I104a7fecec79af9e2b1599abea159e1a78576e1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-301-1/+1
| | | | | Change-Id: If67b3961b1c70bdc50dcbc7d6fdd188afaff17ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-301-1/+1
| | | | | Change-Id: Ieab93c0ddca1194723a5f43ea0d5d38ba27c3cfc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-241-1/+1
| | | | | Change-Id: I8d32e1dc6527c0467c3882c8dee4eaadf2c0df86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-231-1/+1
| | | | | Change-Id: Iff2ebd60d5e1f7c716ab4fde2b3da78287e7e59c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-231-1/+1
| | | | | Change-Id: I5f5a39a4063454bf413ede539fb25d8307b07293 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-231-1/+1
| | | | | Change-Id: I9d74e23a335d5e096bc2da2880d5dacec8d30d04 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-221-1/+1
| | | | | Change-Id: Id605de9ecf73f2a580383b70a8dcda7f729508d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-211-1/+1
| | | | | Change-Id: I656bf6909ca9d04fa197b2811e3e8d89360a96dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-191-1/+1
| | | | | Change-Id: I7205bafbb493cd525cdc1a1dd1f502f16a397d04 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-181-1/+1
| | | | | Change-Id: I7266d934be5aed24c32f0e1cb8e6dc3be2f2f3f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-181-1/+1
| | | | | Change-Id: I639edc977672cf3e958be905094f45b6d2f07cd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Only connect to the items window signals if it has a windowJan Arve Sæther2020-12-162-2/+15
| | | | | | | | | | | | | | | | | If the styleitem was created in a control without a window, it failed to connect to the activeChanged() signal of QQuickWindow. It would consequently warn about invalid null parameter to QObject::connect() If the control was added to a window at a later point, it would also not connect to the activeChanged() signal of QQuickWindow. This could cause that the control was rendered as it would be rendered in an inactive window, even if the window actually was active. Task-number: QTBUG-88553 Pick-to: 6.0 Change-Id: I3aa5948e150f0f4baa204943ec43ea8922421e75 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-121-1/+1
| | | | | Change-Id: Iacb4c3f1e40b43bcd5c3a595a4676d12d358579b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-121-1/+1
| | | | | Change-Id: I2385fd6df5383b9c6116eda5086b9a7b42d7f286 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not crash because of missing context on the indicator buttonsJan Arve Sæther2020-12-112-4/+27
| | | | | | | | | | This now follows the same pattern as QQuickSpinBox does it for it's own indicator buttons. a11y::ScrollBar crashed because of this Change-Id: I5669fa2bf130b37ad46573aae5c6bebd8e0d0434 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Ignore CMakeLists.txt.user filesMitch Curtis2020-12-111-0/+1
| | | | | | Pick-to: 6.0 Change-Id: I25112b2b2ba1316e0535547a01ce3a64e1c59f73 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Bump versionPaul Wicking2020-12-111-1/+1
| | | | Change-Id: I29f96add60c80ee999a54918685fb8c3373dca58
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-111-1/+1
| | | | | Change-Id: I9310059cae7de9029612693a1d51aef524c86d00 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-111-1/+1
| | | | | Change-Id: Ia31794e5d55f6a1e2940668558d15c81a3a3bb2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-101-1/+1
| | | | | Change-Id: Idaab536657fb6d4490ce7cd4eaef800f1adba422 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-101-1/+1
| | | | | Change-Id: Iae3226f52f742fe7dc00b7c94701c1a37e696b5a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add support for ScrollBar arrow buttonsJan Arve Sæther2020-12-1016-219/+609
| | | | | | | | | | | In order to achieve this, it separates out QQuickSpinButton into a separate file (and renames it since it's not only purposed for SpinBox anymore). This allows it to be also used by QQuickScrollBar. Fixes: QTBUG-88115 Pick-to: 6.0 Change-Id: I2dea42b29750b7bc619031f40a43717fc10c177b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Do not crash in deferred execution of there is no context yetJan Arve Sæther2020-12-101-1/+1
| | | | | | Change-Id: Ib7ffbb263856f1ed97693eee10097f8cc2f8fb12 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Fix nativestyle qmldir dependenciesAlexandru Croitor2020-12-102-4/+4
| | | | | | | | | | | | | | | pro2cmake chokes on converting the nativestyle project, because it expects to find a second argument after the depends clause. Add an 'auto', and regenerate the project. Amends a3253c37903e95706f011bc03093160236b57bdc Pick-to: 6.0 Task-number: QTBUG-88492 Change-Id: I4c9114780e17f5bc21a43511e75207eaef5e7550 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-101-1/+1
| | | | | Change-Id: I17776d63c5bed60083e176d567d2f8f6c3875b66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_splitview.qml: Fix organization name in settingsFriedemann Kleint2020-12-101-1/+1
| | | | | | | | | Prevent it from cluttering the settings directory with a "Qt Project" directory. Pick-to: 6.0 Change-Id: Ic774852a76eb94073abd937cb65b28fa9e544837 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix build of some examples on WindowsMitch Curtis2020-12-102-8/+12
| | | | | | | | | | | | | ba2da7d7459a4c64379336435d6091b30ac0d71e fixed the build of some examples when cross-compiling, but for whatever reason it breaks regular builds on Windows. This patch makes that fix more specific in the environments it affects. Fixes: QTBUG-89290 Pick-to: 6.0 Change-Id: I5356a855e3b6f9c27ba05beb9dc11dc32920c6c5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-101-1/+1
| | | | | Change-Id: I1ed8f5f54eb3df4f3c62d762e16c48e5bf1d577e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-091-1/+1
| | | | | Change-Id: I117ee53e50b19a3cbf5886e68a172a5c0c356d1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2020-12-091-1/+1
| | | | | Change-Id: I9a7c2f66098ae06609e3a418f8f7ba0f2d5e9192 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Allow style to be set to "Default" for compatibilityMitch Curtis2020-12-091-2/+5
| | | | | | | | | | | | | | | This unbreaks Qt 5 applications that weren't specifying a style or were specifying Default. [ChangeLog][Important Behavior Changes] Setting the style to "Default" now behaves the same way as not specifying a style; a relevant style will be chosen based on the platform. To use the style previously known as "Default", use "Basic". Task-number: QTBUG-85984 Pick-to: 6.0 Change-Id: I8e5533f9c6834765610773e46f97fbd56a242039 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>