aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | QQuickStackView: transfer focus to the current itemJ-P Nurmi2018-02-132-10/+23
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-51321 Change-Id: I169491d3e04f3ce015f5a999935f45ec02b1b5ae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge tst_drawer.qml to tst_QQuickDrawerJ-P Nurmi2018-02-132-118/+37
| | | | | | | | | | | | | | | Change-Id: I837f6991f5a3b66e3ded9e1408656013a0803d8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Docs: fix qdoc (clang) warningsJ-P Nurmi2018-02-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | qtquickcontrols2-automotive.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: automotive qtquickcontrols2-musicplayer.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: musicplayer qquickspinbox.cpp:814: (qdoc) warning: Can't link to 'textFromValue()' Change-Id: Iec6fd398cca98b514a76fe9f2f30c79a59b81457 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Docs: update the version table for Qt 5.11J-P Nurmi2018-02-131-0/+5
| | | | | | | | | | | | | | | Change-Id: Ib653224d7e30b08ec80b148420717e7e9fec5e7a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Universal Dial: decrease handle size from 20 to 14Mitch Curtis2018-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handle is not interactive; the whole dial is. As it is now, the handle looks way too big. Before and after this patch: https://imgur.com/a/HEbeh Change-Id: I5db93a3e792a2133f765f69566bdd871598ab3b0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Material Dial: decrease handle size from 14 to 10Mitch Curtis2018-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handle is not interactive; the whole dial is. As it is now, the handle looks way too big. Before and after this patch: https://imgur.com/a/amhN3 Change-Id: I13c03085d25ee2eb01090825f6baa531409e02a0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | tst_QQuickPopup: run with all stylesJ-P Nurmi2018-02-121-37/+51
| | | | | | | | | | | | | | | Change-Id: I0f48ef8bbf0cb7567796dc67f1030d274f684d67 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tst_QQuickDrawer: run with all stylesJ-P Nurmi2018-02-121-1/+2
| | | | | | | | | | | | | | | Change-Id: I3cbd5aa20f48051ab80cf7e83661f17010129450 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickUniversalStyle: init the globals from the pluginJ-P Nurmi2018-02-123-56/+51
| | | | | | | | | | | | | | | Change-Id: I9df13f980b565b4f846edc3bce8333b74f5366b9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickCheckDelegate: don't consider partially checked as checkedJ-P Nurmi2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as fbcdccc for QQuickCheckBox. It was noticed missing from the delegate counterpart while updating the "New Features in Qt 5.11" wiki page. [ChangeLog][Important Behavior Changes] CheckDelegate no longer considers the partially checked state as a checked state. This fixes check state cycling for a non-tri-state check delegate so that it goes from partially checked to fully checked state. Task-number: QTBUG-56295 Change-Id: I1de29178c265e027fdb91ba0b4604b110ddba06a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickCheckDelegate: don't force tristate when partially checkedJ-P Nurmi2018-02-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 339ddd4 for QQuickCheckBox. It was noticed missing from the delegate counterpart while updating the "New Features in Qt 5.11" wiki page. This allows a parent node to present partially checked state of child nodes without being interactively a tri-state box. [ChangeLog][Important Behavior Changes] CheckDelegate no longer forces tristate to true when setting checkState to Qt.PartiallyChecked. This allows a delegate to present a partially checked state without being interactively a tri-state check delegate. Task-number: QTBUG-56295 Change-Id: If4aaa499b53b60de0a170d3d0adb662474eddaad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1217-65/+442
|\ \ \ | | | | | | | | | | | | Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
| * \ \ Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-094-8/+108
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia407f277cccfdd96242ebfdbe294d699e26e6b1d
| | * | Bump versionOswald Buddenhagen2018-02-071-1/+1
| | | | | | | | | | | | | | | | Change-Id: I441fd7bf775a5eb02037fb51bd49b2f8b9efde96
| | * | QQuickControl: respect wheel focus policy for focus scopesJ-P Nurmi2018-02-072-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Control] Fixed focus scope controls to respect wheel focus policy. Task-number: QTBUG-66133 Change-Id: If963feba4b6e59b87ca54af5f6606805093eb0cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Popup: fix restoring focus for popups that did not request focusJ-P Nurmi2018-02-062-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup closes, if it has active focus, it should restore focus back to where it was regardless of whether the popup originally requested focus. Even if a popup does not request focus on open, it may gain focus programmatically or when a control with click-focus is clicked, for example. Task-number: QTBUG-66113 Change-Id: I9a7c467abe781bbef390d74898d13b9a30b2695b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | QQuickControl: respect click focus policy for focus scopesJ-P Nurmi2018-02-052-2/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a focus scope explicitly requests click focus, make it gain active focus by clearing the sub-focus child. Pane { focusPolicy: Qt.ClickFocus TextField { } } [ChangeLog][Controls][Control] Fixed focus scope controls, such as Frame, GroupBox, Page, and Pane, to respect click focus policy by clearing a potential sub-focus child. This makes it possible to close the virtual keyboard by clicking the background of a Pane that has Qt.ClickFocus set as its focusPolicy, for example. Task-number: QTBUG-66133 Change-Id: I582f3c66aa6f11e229d89c4f610fae3c6259104d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | QQuickIcon: fix reset methodsJ-P Nurmi2018-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65193 Change-Id: I6393d39add5c3643812084ef4702e843bac14702 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Make AbstractButton's icon properties win over Action's when both are setMitch Curtis2018-02-055-49/+321
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65193 Change-Id: Idff23dcc35f3c3fe41406678613b022098149318 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | | Editors: tweak placeholder text colorJ-P Nurmi2018-02-056-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using 50% translucent palette.text, use 50% translucent TextField::color (which defaults to palette.text) to make the placeholder text color follow the text color when changed directly without changing the palette. In the future, the placeholder text color should be exposed as a separate property to give users full control. Task-number: QTBUG-66176 Change-Id: I57153ff676be6518f9b48cdbd7da4089daa36853 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Add missing meta revision 3 for Label, TextArea, TextFieldJ-P Nurmi2018-02-051-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: "<Type>.palette" is not available due to component versioning. Change-Id: I3687a5879bcdf8f1af36c1b32b796ce2fa7e879e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-2/+4
| |\| | | | | | | | | | Change-Id: I6450d9ea1e5e2081e5ed79f02d485515b582c4f0
| | * QQuickPlatformMenu::open(): Scale target rectangleFriedemann Kleint2018-02-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The QPlatform* classes operate in native pixels. Task-number: QTBUG-55251 Change-Id: Ic9715bc062f7459054ed9735d133b1a5d05b60a2 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Fix memory leak in QQC2Simon Hausmann2018-02-075-46/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When repeatedly creating a QQuickView, loading a QML file that imports QQC2 and deleting the view again, we would leak memory that was allocated as a consequence of QML type registration in initializeEngine() callbacks that were called on every iteration. After the limitation of namespacing in the registerTypes() callback of QML module plugins has been lifted, we can move the type registrations into registerTypes() where they belong and which is called only once. Change-Id: I7e314663a69fd8c8529195b56c128b61392c0042 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devJ-P Nurmi2018-02-0114-5/+110
|\ \ \ | | | | | | | | | | | | Change-Id: I2322df58ae8d6a222e5cd87d6d493b14dce8d505
| * | | Merge remote-tracking branch 'origin/5.10' into 5.11J-P Nurmi2018-01-3114-5/+110
|/| | | | |/ / | | | | | | Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
| * | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2018-01-316-2/+36
| |\| | | | | | | | | | Change-Id: I697f98d5214f487c915032d744ec593da05368a8
| | * QQuickComboBox: fix popup's deferred executionJ-P Nurmi2018-01-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other delegates, such as background and contentItem, popup is not unconditionally executed upon component completion. For performance reasons, its execution is delayed until the popup is needed, that is, the popup is accessed or shown. When the popup is accessed, we use the current completion status via isComponentComplete() to determine whether its execution must be completed immediately, or if we can wait until componentComplete(). However, if the popup was accessed while the combobox itself was being completed (used in ComboBox's bindings), the popup was never completed because isComponentComplete() was still returning false even though the popup was actually being indirectly accessed from componentComplete(). A simple execution order change, to complete the combobox itself before the popup, fixes the problem. Task-number: QTBUG-65962 Change-Id: I4764eb7e273e7f6fa1dab1a65a02b87722ee7cba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Control: fix background size regression caused by deferred executionJ-P Nurmi2018-01-222-0/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-65880 Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Explain the benefits of customizing a control vs creating a styleMitch Curtis2018-01-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that customizing a control is nice because you don't need to start from scratch with a template. Add a third requirement for "Definition of a Style" that mentions that the top level item must be a template, and why. Change-Id: I4db4ec8311baed46fb45271d107204808ba42592 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Link to Customizing doc from Styling docMitch Curtis2018-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | These two things are closely related. Change-Id: I1b4586f7835af6bd9f82aaa6eeb75fe1ef6ba65d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | tst_qquickiconlabel: skip colorChanges() that grabToImage() on offscreen ↵Liang Qi2018-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Change-Id: Ifac43dfa26182e3b518397fa070bb4d4a62114e0 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | tst_qquickiconimage: skip tests that grabToImage() on offscreen platformsMitch Curtis2018-01-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LinuxQEMUarm64GCC and LinuxQEMUarmv7GCC CI platform fails because they use QT_QPA_PLATFORM=offscreen, and grabToImage() doesn't work on offscreen platforms. Task-number: QTBUG-63185 Task-number: QTBUG-65975 Change-Id: I037110408bd7b676d6ca142808774b29d1aa749f Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 17:56:22 +0000