aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-231-2/+2
| | | | | Change-Id: Ie7b3708b2fdb7b16f01a190dc5e5edf6016e3994 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-228-443/+302
| | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I75bbde32ffdd67ca0670d0afecb4064232c1dae4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I27ad2c0c904e33d2112195d1bad13e0a7da4b8f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* Don't access QStyleOption* without checking for nullptr firstVolker Hilsheimer2021-05-191-2/+2
| | | | | | | | | | | It can be nullptr as per the preamble to the function, and the fact that the parameter defaults to nullptr. Addresses code checker report 723994a37c58a4dcc3aeb573e1d517c5. Pick-to: 6.1 Change-Id: Id17c95314f4adfa48e7754120ecc36a2efac5403 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-191-2/+2
| | | | | Change-Id: I5c8bade88cdab5e05d1e6290856475496a1a0ebd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Hide old scroll barsMitch Curtis2021-05-193-0/+81
| | | | | | | | | | 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: I23f2b9670512cb79f07768d42c7b703e48d3bfb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: apps that never set a style in Qt 5 should set Basic in Qt 6Mitch Curtis2021-05-121-0/+5
| | | | | | | | | | This avoids surprises when moving to Qt 6, where the default style is now platform-dependent. Fixes: QTBUG-92158 Pick-to: 6.1 Change-Id: I44cede00379b507f97ae7ac51aa5717c1b6510a8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-121-2/+2
| | | | | Change-Id: Ie81b4beb1fea9f32409e5683049e7106c57f48ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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-116-4/+230
| | | | | | | | | | | | | | | | 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>
* Remove Qt Quick Calendar from overviewKai Köhne2021-05-111-4/+0
| | | | | | | | The module is only available on marketplace Pick-to: 6.1 Change-Id: I0910630b746b6eb4935fabdbc5148677c08bb234 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Slider: Fix broken NoSnap and SnapOnRelease modeJonas Karlsson2021-05-072-31/+45
| | | | | | | | | | 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>
* Imagine: fix GroupBox's bottom edge being clippedMitch Curtis2021-05-061-2/+1
| | | | | | | | | | Use the actual padding from the nine patch image rather than the hard-coded 12. Fixes: QTBUG-91924 Pick-to: 6.1 5.15 Change-Id: I4707ae173c088625657a135680619cf646e3a9e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-051-1/+1
| | | | | Change-Id: I2166ff00711592cfd24d16833e20e224771d67b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* macOS, Slider: draw a focus rect, and not a focus ringRichard Moe Gustavsen2021-05-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | In the mac style, we draw the focus ring for a slider from QML around the handle. This has shown to be fragile, since UIKit doesn't draw the handle in the center of the rect we get when we query UIKit (using the [cell knobRectFlipped:slider.isFlipped]). And then the focus ring will be offset as well. While we could try to adjust the rect manually from QQuickMacStyle, this will only be quaranteed to work on top of the current macOS SDK (macosx11.1). So for that reason, this patch falls back to use the less correct, but more future safe, solution of drawng the focus ring as a rect around the handle instead. While this doesn't look native, it still looks better (and correct, for the uninformed) compared to an eliptic ring that is misplaced on the target. Fixes: QTBUG-93423 Pick-to: 6.1 6.0 Change-Id: Ibc00f12f9606cd66c8ff384967aa3ea0d7727964 Reviewed-by: Jan Arve Sæther <jan-arve.saether@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>
* Native style: fix up some commentsRichard Moe Gustavsen2021-05-051-3/+3
| | | | | Change-Id: Id3d3db4b49dcbbc662a24eabb65ac6908577a4af Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-051-2/+2
| | | | | Change-Id: If2f2b5b49e49485aae3e237bc0a8dd0e2c187cb3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-041-2/+2
| | | | | Change-Id: I507b4900ffb35931d9cfd01b99ad8c6e1ac042d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-041-2/+2
| | | | | Change-Id: I4a889629910bb449dc386c130e01d5f9a39135ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-041-2/+2
| | | | | Change-Id: Id17f7b0309bd391ee29295461842d1d4ed36aa2c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QQuickDial: Keep value integer if everything is integerFabian Kosmale2021-05-032-3/+46
| | | | | | | | | | | | | | | | 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 dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-031-1/+1
| | | | | Change-Id: Id31806ec7fba0db547e65fc18a956e946440152a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-011-2/+2
| | | | | Change-Id: I92b22488828cc9cb6b8d2732eef669521d7f3aca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-011-2/+2
| | | | | Change-Id: Iccdc50e84e8a332b8361ceb6811f392dc7ed0079 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-05-011-2/+2
| | | | | Change-Id: Idf97efbec24338d58e24505b61dab266ede7fd64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-301-2/+2
| | | | | Change-Id: Ibbae24d4460e770e4cb39f33d57016c62c3bec49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-281-2/+2
| | | | | Change-Id: Iba06adbd51ef68b3f349bbf699f61a3a812b75f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* doc: document the native stylesRichard Moe Gustavsen2021-04-288-0/+162
| | | | | | | | | | | This patch will add documentation for the native styles that was added to Qt 6.0. Fixes: QTBUG-88220 Change-Id: Ib0703b3758d48586cd8465ea9188691b9e377064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 30cf78d48f6a3778e8b4ec2e2b8924b25fdc85cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-281-1/+1
| | | | | Change-Id: I7e3319c24b0f9b1d6ce7ef51fc45f6bce4c2164a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* CMake: Avoid duplicate symbol errors due to a common resource nameAlexandru Croitor2021-04-271-1/+1
| | | | | | | | | | | | | | | The macOS nativestyle plugin uses the 'qmake_immediate' resource name, which conflicts with any test / example that might create a resource with the same name. This is problematic in static builds because it causes duplicate symbol errors when linking. Use a different unique resource name instead. Pick-to: 6.1 6.0 Fixes: QTBUG-93172 Change-Id: I29dee69190d75fe11c8993353349e3db2004d276 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* CMake: Remove GENERATE_METATYPES usageMaximilian Goldstein2021-04-273-3/+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-273-0/+7
| | | | | | Change-Id: I871e115f27c3c43a9e9b2e23392cd1dcbfb0cec0 Pick-to: 6.1 6.0 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: I59531a991c8eb310bac08eff7cde5f5856bd5bae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-271-2/+2
| | | | | Change-Id: Idebcf9cda0a5a44604829ab43211956439868c90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-261-2/+2
| | | | | Change-Id: Iebfabbcdee7eb5ec31bb172ee1b8871b516d8844 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix build without features.imageformat_pngTasuku Suzuki2021-04-271-6/+3
| | | | | Change-Id: Idc5a1c175fa942e90830ae8b81f6627a729f7220 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix build without features.imageformat-xpmTasuku Suzuki2021-04-261-0/+2
| | | | | Change-Id: Ib125517f87be0dac22eaeba059a6cdfd18abb7b7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix build without features.quicktemplates2-hoverTasuku Suzuki2021-04-261-1/+1
| | | | | Change-Id: I02096558d480dcef456f9cd1e86c7c843179758c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix up build system files for manual testsMitch Curtis2021-04-2613-3/+75
| | | | | | | | | | - Add missing tests to qmake/CMake "sub-dir" projects - Make each manual test a standalone project so that it can be opened in Creator Task-number: QTBUG-93020 Change-Id: I534192852fb8ffdf85398479fb0da2a29d04330a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-241-2/+2
| | | | | Change-Id: I93330a38ef354714619d3cc4d6b8c15d9e33ed04 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtquickcontrols2Qt Submodule Update Bot2021-04-241-2/+2
| | | | | Change-Id: I54905c53626217ebf7bbd556e0058c6af78d9639 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ScrollView: fix crash when scrolling with zero-sized itemMitch Curtis2021-04-233-1/+34
| | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 06:12:12 +0000