aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Link to RangeSlider from Slider's docs, and vice versav5.11.0-beta3Mitch Curtis2018-04-042-0/+5
| | | | | | Task-number: QTBUG-67316 Change-Id: Ia10778f5e3da8f7c3480504792da228b90bb4854 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: use Math.round() in Overlay parent exampleMitch Curtis2018-04-041-2/+2
| | | | | Change-Id: Ib8c0688e071781e25ef4fdd8a51e302def32215f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix current color is not set first time in ColorDialogTasuku Suzuki2018-03-261-0/+1
| | | | | | Task-number: QT3DS-1363 Change-Id: Id464f3373bdc486060dcd1e351ffe29c55d85696 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Do not execute a deferred property when component complete is disabledThomas Hartmann2018-03-261-0/+5
| | | | | | | | | | | The Qt Quick Designer disables component complete and completes the items manually at a later point. To avoid undefined behavior on items quickBeginDeferred() should not be called if completion is disabled. Task-number: QTBUG-67152 Change-Id: Ibf5c6c834436889cfda7862ea7b327731a026cf9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add a few missing properties to property editorThomas Hartmann2018-03-233-0/+67
| | | | | | Change-Id: I25bfc453bdfdc007ec10a69de92f3f339617c2d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_customization: only track objectNames we're interested inMitch Curtis2018-03-231-1/+3
| | | | | Change-Id: I496a6a60383c0332ec52e9349892c8923ed42c76 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Combo|SpinBox: fix wheel event propagationJ-P Nurmi2018-03-234-8/+31
| | | | | | | | | | | Sync the behavior with Qt Widgets. Don't propagate wheel events when reaching the end. The behavior was not nice, that a ScrollView underneath started suddenly moving whilst these input controls had input focus. Task-number: QTBUG-66044 Change-Id: I1b9c7f005652041cd82c77d4a1ca1a01d7d536e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStyle: use local 8-bit for paths from env varsJ-P Nurmi2018-03-231-4/+4
| | | | | | | We must not assume that paths are Latin-1 strings. Change-Id: I13814bf29c9ebb12b71e5c559843589946a7ecac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Shortcuts in Popups with window context not being activatedMitch Curtis2018-03-222-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | Before this patch, this code wouldn't work: Popup { id: popup Shortcut { sequence: "Tab" onActivated: popup.visible = !popup.visible } } Even though Popup is aware of its Window, the Shortcut object is parented to Popup::contentItem, which does not have a Window associated with it while the Popup is hidden. The fix is to check if the item has a window in QQuickShortcutContext::matcher(), so that that check fails and the QQuickPopup itself is used to access the window. Change-Id: Ia1c5d75ad6b82fb4c8b7664b6d418d84428b1ddf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Ensure that qtquickcontrols2.conf files show up in examplesMitch Curtis2018-03-211-0/+2
| | | | | | Change-Id: Id90ec3a30df73c7e510f388876bc92e552685177 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add a section about how to preview custom styles in Qt Quick DesignerMitch Curtis2018-03-211-0/+16
| | | | | | | | | There was a question about this recently, but our docs aren't exactly clear about it. Change-Id: I152e88f656505aace26b4a517daf79c9df8745c2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: update list of signals emitted when buttons with roles are clickedMitch Curtis2018-03-211-3/+27
| | | | | | | | There are a lot more than mentioned in the detailed description, so add a table and list those suckers. Change-Id: I92eb33a0d7071426328dafb2b1ec0096d075f257 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove unused snippetsMitch Curtis2018-03-2121-792/+0
| | | | | | | | These snippets are not referenced by their file names (without extension) by any files in the repo. Change-Id: Ia2cc52fc62dc15a525880678e544e792a64dab5e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix crash with StackView::initialItemSimon Hausmann2018-03-214-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following binding initialView: Qt.createComponent("blah.qml") works with QQC1 but crashes with QQC2 as soon as the garbage collector kicks in. In QQC1 StackView was implemented in a .qml file and the property was declared as property var initialItem For such declared properties the QML engine takes care of ensuring that the reference assigned is a strong reference towards the GC and it also tracks the life-time of the QObject in case it's explicitly deleted by somebody else. In QQC2 the property continues to be documented as "var" property, however it is implemented in C++ as QVariant property. The QVariant is not known to the GC at all and it also doesn't do life-cycle tracking. The C++ equivalent to "var" in QML is QJSValue, which is a strong reference and also ends up using a QPointer internally when holding a QObject. Task-number: QTBUG-67118 Change-Id: I43e473c7bf2c40f9843e9d50fe4fd805b54fd256 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Avoid crashes when the qquickcontrols2 plugin gets unloadedLars Knoll2018-03-161-1/+2
| | | | | | | | | | | | The styleSpec() can be a nullptr in some cases, so test for that before calling reset() on it. Fixes a crash on exit in the qqmlextensionsplugin autotest of qtdeclarative if qtquickcontrols2 has been compiled. Change-Id: Ic43cbec57b36f9a0181d3b0c50d4a19236b5870e Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Imagine: make the QML files show up in Qt CreatorJ-P Nurmi2018-03-131-3/+4
| | | | | | | | Unlike all other styles, imagine.pro was not assigning QML_FILES to OTHER_FILES that makes the .qml files show up in Qt Creator. Change-Id: I7510e8db6ef606774983151da3bae089a4697e8c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix doubly connected signals in SignalSequenceSpySimon Hausmann2018-03-121-3/+8
| | | | | | | | | | | | | | | | | | | | We call __setup() from two different onFooChanged signal handlers. If we access the second property from within that method, we may end up being the first one to read that property and consequently require an initialization of the binding to that property first, which will write the value (before returning) and trigger the signal handler, recursively calling __setup() and thus calling connect() twice for each signal the spy wants to connect to. This used to be fine as we ended up with a _third_ evaluation that called __setup() and thus cleared the connections first, but after commit f514451cc2e3610e160b5dc8ccd1e390730ecc67 in declarative we avoid unnecessary binding evaluations if possible and therefore uncovered this bug. Task-number: QTBUG-66995 Change-Id: I83ef9c80978a88c1490174d3cdb21b149733a78f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ComboBox: fix key search in the popupJ-P Nurmi2018-03-122-3/+62
| | | | | | | | | | | | | | | | ComboBox does not change its current index, but highlighted index, when navigating in the popup. If the popup is accepted, the currently highlighted index is applied as the new current index. However, if the popup is rejected, the old current index is kept intact. This is why there is a separation between current and highlighted index. The newly added key search functionality (added together with ComboBox::editable) was missing a check whether the popup is visible. It was unconditionally changing the current index, which lead to a wrong behavior when the popup was open. Task-number: QTBUG-61348 Change-Id: Ic0295db609495ccefbccb7c425a817926786014e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Sliders and Dials: keep mouse grab on pressJ-P Nurmi2018-03-127-45/+10
| | | | | | | | | | | Since Qt 5.9, Sliders and Dials react immediately on mouse press. Thus, the old logic to keep mouse grab if the drag threshold was exceeded no longer makes sense with mouse. Don't allow e.g. Drawer to steal mouse press if a Slider or Dial is already being dragged. Task-number: QTBUG-66637 Change-Id: I76f7ab59180c1f3fb66db8412d7cccfbd373aee3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickDrawer: fix draggingv5.11.0-beta2J-P Nurmi2018-03-093-8/+139
| | | | | | | | | | Make sure to respect keepMouse|TouchGrab. This fixes dragging a horizontal Slider inside a Drawer on the left or right edge, for example. Task-number: QTBUG-66637 Change-Id: Ie3688744741378694f96abc608dad2630ecd1fb0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickPlatformMenu: fix crash on exit with submenusMitch Curtis2018-03-082-4/+17
| | | | | | | | | Ensure that we unparent submenus in destroy(), not just in the destructor. Task-number: QTBUG-66889 Change-Id: I18b5fc28ee47a50f511ef4f8cf55cfdcbae9bfec Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickPlatformMenu: fix submenu titles not being visibleMitch Curtis2018-03-072-0/+22
| | | | | | | | | As with other properties in QQuickPlatformMenu, ensure that we set the relevant property on the internal QQuickPlatformMenuItem. Task-number: QTBUG-66876 Change-Id: Ie37d874426200014ea3bb4045bc6b566422221de Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: add a "Focus Management in Qt Quick Controls 2" pageMitch Curtis2018-03-0613-10/+78
| | | | | | | | This will list each control that is a focus scope, and have some relevant information about focus in Qt Quick Controls 2. Change-Id: I3126452bf73f7d7730d0522d616d61ad0da0dd74 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: add an example of submenus and dynamically generated menu itemsMitch Curtis2018-03-061-0/+62
| | | | | | Task-number: QTBUG-66874 Change-Id: I1e34039e4fa0344b1efdcb2977586d97ada6b31e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Platform: fix checkable MenuItemJ-P Nurmi2018-03-012-10/+8
| | | | | | | | Update the internal checked state before emitting triggered() Task-number: QTBUG-66386 Change-Id: If120955681b2011bf88126a1ca6032f0af482824 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickTheme::font() and palette()J-P Nurmi2018-03-012-4/+42
| | | | | | | | | | | | | | | | Respect fonts and palettes from :/qtquickcontrols2.conf, but don't blatantly override the platform fonts and palettes with null values if the fonts and palettes are not set in :/qtquickcontrols2.conf. Even though fonts and palettes have technically same problem, testing the system palette is hard with 5.11 since QQuickDefaultTheme is a platform proxy theme and provides a custom system palette. It should be possible to have tst_palette::systemPalette() in dev, though, where we have removed the inheritance between QQuickTheme and QPlatformTheme. Task-number: QTBUG-66430 Change-Id: I6dfe678ccdc7e3990320c120612cfcc68723264d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add an "Item Ownership" section toStackView's documentationMitch Curtis2018-03-012-1/+62
| | | | | | | | | It's important that users know the circumstances under which the items managed by StackView will be destroyed. Task-number: QTBUG-66658 Change-Id: I26e287b3dfed44e441125080443bdae4ee1814b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Material: round ripple translation to avoid artifactsJ-P Nurmi2018-03-011-2/+2
| | | | | | | | | 3b36c4e4 rounded translation of the ripple background node. Do the same for the ripple wave node. Task-number: QTBUG-58646 Change-Id: I455249603e5845a8790dcb374564744de4b880e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: calculate BusyIndicator's line widthJ-P Nurmi2018-03-011-1/+2
| | | | | | | | | | | A BusyIndicator with its default implicit size (48px) gets the same line-width (4px) as before: 48px / 12 = 4px. The line-width is still not adjustable as requested in QTBUG-64872, but tiny and huge busy indicators look now much better. Task-number: QTBUG-64872 Change-Id: If21feaf1f898b337eae879a961d37b54b217ed87 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fusion: fix BusyIndicatorJ-P Nurmi2018-03-011-1/+3
| | | | | | | | | When running is set to true, QQuickFusionBusyIndicator, which is a QQuickPaintedItem sub-class, must trigger an update. Task-number: QTBUG-66752 Change-Id: I848a0008d7c8bd3f26f5daf54881c80cc6ba557e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-02-262-78/+185
| | | | | Change-Id: I3b98e4c2159ba37b0b8d0ef5099b93308c84db11 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update versions in the docs and .prosJ-P Nurmi2018-02-2618-21/+21
| | | | | Change-Id: I5b4af1ddfe8c4583731f5a90082d803298bdf9bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix quickCancelDeferred()J-P Nurmi2018-02-261-4/+5
| | | | | | | | | | Don't assume that declarative data (QQmlData) exists. It doesn't exist for items that have been created outside of QML, which is the case for those content items that are lazily created from C++, for example. Task-number: QTBUG-66669 Change-Id: Ib18455b275034dc2aec6d2405c0c2509d39fc77d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* DialogButtonBox: workaround implicit size calculation with one buttonv5.11.0-beta1J-P Nurmi2018-02-225-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | When there's only one button in the dialog button box, the Default and Universal styles resize the button to cover half of the button box. This works in typical scenarios when the dialog button box is assigned as a footer of a dialog, and thus, gets resized together with the dialog. However, if the dialog button box is placed into a layout, or otherwise not given an explicit size, the implicit size calculation loops until it reaches zero. 1) button box gets the implicit size of the content (one button) 2) button box resizes the button to cover half of the box width 3) button box re-calculates its implicit size => step 1 Avoid the problem by providing a reasonable hard-coded implicit size for this special case. Notice that this is just a temporary workaround to avoid the problem. This can be fixed properly in dev by providing separate contentWidth and contentHeight properties that cleanly propagate the content size to QML. Task-number: QTBUG-59719 Change-Id: I552e0824ae6bff26b570c699252a3e4f09bd3397 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix ItemDelegate's vertical paddingJ-P Nurmi2018-02-201-0/+2
| | | | | | | | Sync with all other delegate types. This makes ItemDelegate less prone to losing 48px height as per the design guidelines. Change-Id: Idf4a097440236c35213ce1cb1e9709776fd8e95f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Imagine: declare missing QtGraphicalEffects dependencyJ-P Nurmi2018-02-201-0/+1
| | | | | | | | | | DelayButton and ProgressBar are using QtGraphicalEffects. The dependency must be declared in static builds: DelayButton.qml:41:1: module "QtGraphicalEffects" plugin "qtgraphicaleffectsplugin" not found Change-Id: Ic6774a2ebb85e6324ad6e9e222d15120c191a144 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix tst_swipedelegate::test_eventsToLeftAndRight()J-P Nurmi2018-02-201-2/+2
| | | | | | | | | | | | | The test fails with the Fusion style and a static build on Linux. Even if either "dx" or "dy" is defined as 0, TestCase::mouseDrag() drags _at least_ the distance of QStyleHints::startDragDistance() in _both_ directions. Therefore, if we start the drag from the vertical center of the control, a horizontal drag may end below the control and then SwipeDelegate considers the swipe canceled. Change-Id: Ib735ebeb2184d095dfaf0a4c3bdff0bead4bdbd6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_switchdelegate: fix test_mouse/test_touch failuresJ-P Nurmi2018-02-201-6/+6
| | | | | | | | | Same as a1eaa30b for tst_switch. Use the correct coordinates for the middle of the switch. Otherwise this test fails in static builds. Task-number: QTBUG-62241 Change-Id: Ic99babac5c41f5130931790d8cd984fac72cb785 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStyle: fix and test QT_QUICK_CONTROLS_CONFJ-P Nurmi2018-02-209-1/+50
| | | | | | | | Reset QT_QUICK_CONTROLS_CONF when appropriate, and add some tests too since the environment variable is now public and documented. Change-Id: I09fba950de7c34f22c4cf802ea5c0a337c84f0bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Reset QQuickStyle when the QtQuick.Controls 2 plugin is unloadedJ-P Nurmi2018-02-202-9/+34
| | | | | | | | | Cleanup global static data in QQuickStyle when the controls plugin is unloaded (qmlClearTypeRegistrations()). This ensures that the style is resolved as appropriate when the controls plugin is reloaded. Change-Id: Icebb835e057e6063e4fc0ca035c6836560bc7c14 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-181-0/+4
|\ | | | | | | Change-Id: I91f8b19e02b7350a2569ab14fe79fe809202e6a8
| * Doc: mention QT_QUICK_CONTROLS_CONF in conf docsMitch Curtis2018-02-121-0/+4
| | | | | | | | | | Change-Id: I7f6d156d54a4c407853af5baa5bf59125ab35bde Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | GroupBox: fix background y and height assignmentsMitch Curtis2018-02-166-11/+11
| | | | | | | | | | | | | | Use the more specific bottomPadding rather than padding. Change-Id: Ib8823d6d9b07eaea97479ef432df0868b1b5d37d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: sync CheckDelegate's vertical padding with other delegatesMitch Curtis2018-02-161-2/+2
| | | | | | | | | | Change-Id: I83e5d787d0706dc547a9d906fdafef97e838172f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Document how to position a popup in the center of the windowMitch Curtis2018-02-163-19/+31
| | | | | | | | | | | | | | | | | | This was already in Overlay's docs, but not Popup's, so this patch moves the example to a .qdocinc and includes it in both places, creating a new Popup Positioning section in the process. Change-Id: I8e8438919fd849a8466b3a28133d22bb45f7dc19 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Examples: don't use anchors in layoutsMitch Curtis2018-02-162-6/+5
| | | | | | | | | | Change-Id: I9130e8d143b1f6b2ac6ec2839e47858db3e67dff Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: remove hovered states as the property is read-onlyv5.11.0-alpha1Mitch Curtis2018-02-142-12/+1
| | | | | | | | | | Change-Id: Iebc19620b34d9a8a7cc954c9486b739eed1de4a4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: set checked on ButtonMitch Curtis2018-02-141-0/+1
| | | | | | | | | | Change-Id: Ic63b9c17318b357f4f34a5c49ff3d27bb438856c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+49
|\ \ | | | | | | | | | Change-Id: I695b13b1708265aab9b8d83f4f3dfd1f535e150b
| * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+49
| | | | | | | | | | | | | | | Change-Id: I27b28095a9481b962fe450be9f67b31f36880dac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 14:24:48 +0000