summaryrefslogtreecommitdiff
path: root/tests/auto/controls/data
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated FDL license headerKai Koehne2017-10-181-3/+13
| | | | | Change-Id: I03c222a72490959d55b3077a6282553a4bfcf7d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update slider handle position when maximum changesFrederik Gladhorn2017-10-101-1/+14
| | | | | | | | | This is exactly the same as the minimum change, when the maximum is changed, the handle position needs to be re-evaluated. Task-number: QTBUG-63354 Change-Id: I13a67451190a3bb7915afe8e89501097c1dd3301 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* tst_menubar: use createTemporaryObject()Mitch Curtis2017-08-221-11/+5
| | | | | | | | | This seems to help get rid of the ApplicationWindows that would otherwise stick around until the end of the controls tests. Change-Id: I0f5cc81e07c727070c3f80654d46881c696eebe7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Increase QtQuick import from 2.2 to 2.6 for QML LabelJussi Witick2017-06-161-0/+11
| | | | | | | | | Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Slider: Don't suppress updates by dragThreshold on non-touchscreensUlf Hermann2017-05-101-1/+1
| | | | | | | | | | | | When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Revert "tests: skip several tests in tst_treeview.qml"Liang Qi2017-02-221-8/+0
| | | | | | | | | | This reverts commit cdd589d53c8f2f03c868cb618baf7f55956ebcb6. It got fixed by qtdeclarative 2a15f6c5. Task-number: QTBUG-49360 Change-Id: I0ad7f30c0bc442510a0918f0a61e64e966dd6676 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* tests: skip several tests in tst_treeview.qmlLiang Qi2017-02-171-0/+8
| | | | | | | | Didn't find correct BLACKLIST way yet. Task-number: QTBUG-49360 Change-Id: I43ff4ccfd6f0b48088925a72ed8e8e6232607b78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* test: delete tst_layout.qml and related filesLiang Qi2017-01-203-186/+0
| | | | | | | | They will be moved to qtdeclarative. Task-number: QTBUG-58294 Change-Id: I2fcc2fa07db07c2a90a68e77656140e7cf8cdc2b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-197-3/+222
|\ | | | | | | | | | | | | Conflicts: src/controls/controls.pro Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-187-3/+222
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/Private/qquickrangemodel.cpp src/controls/Private/qquickrangemodel_p.h src/controls/Private/qquickrangemodel_p_p.h src/layouts/qquicklayout.cpp tests/auto/controls/data/tst_rangemodel.qml Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
| | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-163-0/+119
| | |\ | | | | | | | | | | | | Change-Id: I216e0df7ffff798827f4bea2c5cb8769eb37a053
| | | * Fix crash on exit when using default property aliases with layoutsv5.6.25.6.2Mitch Curtis2016-09-133-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The layout was being destroyed before the text, which meant that the removeItemChangeListener() call never got hit. To ensure that the listener is always removed, loop through each child in QQuickLayout's destructor. Task-number: QTBUG-51927 Change-Id: I4235579501bd1790e9483a8741915e55f1b1b803 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * | Slider: fix the handle's position when minimumValue is not 0Mitch Curtis2016-09-141-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __handlePos (badly named; it should be, e.g. __handleValueForPos) represents the value of the handle based on "fakeHandle"'s position. It is the result of range.valueForPosition() being called. However, the arguments to this function (fakeHandle.x and fakeHandle.y) don't always change when the values of the slider change, which leads to the x calculation for the handle delegate in SliderStyle having outdated information, causing the related bug. The fix for another bug already works around this issue by passing the relevant properties as arguments (which are ignored) to the function call. This is presumably done this way because it should be cheaper than forcing the JavaScript engine to evaluate a more clearly written expression where each related property is on its own line, for example. property real __handlePos: { range.positionAtMinimum, range.positionAtMaximum; return range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y); } In the case of the related bug, minimumValue has been updated, but __handlePos is still using the old value, causing the handle to be positioned incorrectly. So, we continue this tradition and add another property to the list of arguments. Task-number: QTBUG-51765 Change-Id: I40882872e668a867a8f5e5768244e199618bd769 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * | Attempt to stabilize tst_scrollviewJ-P Nurmi2016-09-051-1/+1
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-55727 Change-Id: I6cbc1f020ead184fd8475f965f69db635ee2cc7b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * RangeModel: Emit min/max and value changes after component is completeJoni Poikelin2016-08-302-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | Prevent extra value changed signal to be fired in case when Slider with minimum > 0 and value > minimum are set. Change-Id: I86824c403a7c0296f782d2eec7ed30acfc13b304 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-301-0/+63
|\ \ \ | |/ / | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-271-0/+63
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| | * Update scroll indicator position on content size changeNikita Krupenko2016-08-181-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If scroll indicator is at the beginning and data prepended to contentItem, scroll indicator should change position to previous content beginning. This is especially important with so-called "infinite scrolling", when scrolling goes upwards and new content added at the top of the view. Task-number: QTBUG-50795 Change-Id: I250d6535b1146a54c6a70062b659cc49ed43709f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-021-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-2/+5
| |\ \ | | |/ | | | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| | * Fix incorrect usage of tryCompare in Tests_Calendar::asynchronousMitch Curtis2016-07-071-2/+5
| | | | | | | | | | | | | | | | | | Change-Id: I1c4c467eb549ea0be40cb1706647f933a963ada5 Task-number: QTBUG-54558 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Tests_Calendar: don't test that the calendar is hovered after a pressMitch Curtis2016-07-201-5/+3
|/ / | | | | | | | | | | | | | | | | | | This doesn't really make sense. Rather wait until after we start moving the mouse. We have another test dedicated to testing hover events. Task-number: QTBUG-54833 Change-Id: I0db8001cd5e069d41dd69be5bf1e0635142426f1 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-0/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Skipping quickcontrols: Test_TreeView::test_indexAt()Milla Pohjanheimo2016-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | Because of bug QTBUG-47523 we need to skip this test until it is fixed properly. Remove the 'skip' after the bug is fixed. Task-number: QTBUG-47523 Change-Id: I4ba514ac7cc38026ced16f8e12bea6e8ac329818 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
* | Correct scrolling direction when using SlidersMorten Johan Sørvig2016-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Account for OS X "direct"/"inverted"/"australian" scrolling. This ensures that a touchpad right/left/up/down flick will move the slider handle in the same direction as the flick. This takes advantage of the recent addition of QWheelEvent::inverted in qtbase Change-Id: If51ec6f0cbc12a042a92aa55964633c9521469a9 Task-number: QTBUG-35972 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-291-3/+97
|\ \ | |/ | | | | Change-Id: I1bf9c0967db59e25ed7fd848269246d611364f4b
| * Added test for keyboard navigation in submenusFilippo Cucchetto2016-02-161-3/+97
| | | | | | | | | | | | | | This should test QTBUG-41951 Change-Id: I262f3e7ca1573dcfb149f3ae942e17817d2e1caf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Move Qt Quick Layouts to qtdeclarative repoJan Arve Saether2016-02-262-1957/+0
| | | | | | | | | | Change-Id: Ia82322488e804ba40d4c91d0bc7e6431ebe973be Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0473-219/+949
| | | | | | | | | | | | | | Updated BSD license headers Change-Id: I73d67dbc6dbbe7c58d2b9c301b46fb6163243095 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-042-36/+20
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I2b4c7522e5ec10dc7e9422886a20802d53929f30 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-212-1/+15
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-161-1/+1
| | | | | | | | | | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01 Task-number: QTBUG-49794 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Fixed missing close of the ComboBox when clicking on itFilippo Cucchetto2015-12-071-0/+14
| | | | | | | | | | | | | | | | | | | | The mouse event that dismissed a popup window should not dispatched to the visual item. Otherwise the menu open again. Task-number: QTBUG-44532 Change-Id: Id8aca1634e4f1795e546230953bff49518589714 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-024-4/+54
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_menubar.qml Change-Id: I23c3299e6f6cef14093aa4f79b3e7d769c063064
| * Menubar popups should handle only release events of a previous press eventFilippo Cucchetto2015-11-261-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is brought up by a press event for a menu inside the menubar it should not handle the relative next release event if it falls outside the popup. Before forwarding the release event we first check if a previous press event was seen, if not we simply discard the event. Task-number: QTBUG-47295 Task-number: QTBUG-45117 Change-Id: I632fab0a3abfdfc9872f85f99f9d7f50d41526cc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix tst_treeviewJ-P Nurmi2015-11-241-2/+2
| | | | | | | | | | Change-Id: I662eea96b72043d06fe94707e77a9ead5a951e3d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Skip controls tests when touch screen is present.Friedemann Kleint2015-11-173-0/+30
| | | | | | | | | | | | | | Task-number: QTBUG-49359 Task-number: QTBUG-49360 Change-Id: I96ec6d46de189ec396ef26c0d059c65360da4ec0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-055-3/+128
|\ \ | |/ | | | | Change-Id: I5d230ebc7c3646fce983cb21892cc3ce42854256
| * BasicTableView: Use ListView's overlay header for the table headerGabriel de Dietrich2015-11-032-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previoulsy we manually positioned the table header over the table contents, which required some manual tweakings. Since 5.4, ListView support overlay headers that we can use them to clean our code in BasicTableView. There is, however, a small issue on Mac where the vertical scrollbar (specially in non-transient mode) is displayed below the table header. Since the header can't span beyond the ListView boundaries, we need to account for the vertical scrollbar width in the ListView's content width. This patch also updates the Desktop style to set the transientScrollBars property and some small tweaks to the Base style. Change-Id: I4433d0703328f23eadb0ae4563fbef5bba0168db Task-number: QTBUG-34344 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-283-0/+121
| |\ | | | | | | | | | Change-Id: I7177ee6f1dc74d7f0d2ac9a3aedcc8d7a00cee41
| | * Allow ComboBox to select items with empty textNikita Krupenko2015-10-261-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBox checks selected text like a boolean value. This check is unnecessary and prevents from item with empty text could be selected. [ChangeLog][ComboBox] ComboBox is now able to select items with empty text. Task-number: QTBUG-42127 Change-Id: Ifaa0598d17c85cee099c88f4e03092137ba17c70 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Avoid real-rounding glitches near ends of a slider's range.Edward Welbourne2015-10-212-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | Floating point doesn't quite reliably satisfy certain standard identities of arithmetic ... Task-number: QTBUG-42358 Change-Id: I7417feedbfc1fd6f59510e0ee6d07d98ff7ddc46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-142-2/+25
|\ \ \ | |/ / | | | | | | Change-Id: I27600aa69f6c236229f80f7d4a278f5ab9640f6b
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-10-022-2/+25
| |\ \ | | |/ | | | | | | Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
| | * Menus: Clean popup hide and destroy logicGabriel de Dietrich2015-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a menu popup gets closed it usually needs to be destroyed right away since we don't recycle its contents. There is an exception, however, and it's when he user triggers a menu item. In this case, we need to proceed in three steps. First, we hide the menu popup, then we emit the triggered signal, and when that one returns, the menu contents can be disposed. If we did all in a single step, we may end up with a crash since we don't support deleting a QtQuick item while it's running a signal handler. Delayed deletions don't work either in the case when the triggered handler ends up running the event loop. Task-number: QTBUG-45182 Task-number: QTBUG-47682 Task-number: QTBUG-48382 Change-Id: Ic39717e09f38df602f641250cd81cf4931863db6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * Merge 5.5 into 5.5.1Oswald Buddenhagen2015-09-111-0/+22
| | |\ | | | | | | | | | | | | Change-Id: I6a887182dbed50c8028bd2dbed71e48d5226fac8
| | | * Button: only enable mnemonic if button itself is enabled.Mitch Curtis2015-09-071-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise users can trigger shortcuts even when buttons are disabled. Change-Id: If97c6a3c3df574a4271c53cf7bcfd8fdb1a059d6 Task-number: QTBUG-48144 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | Menu: Schedule popup deletion when it's about to hideGabriel de Dietrich2015-09-111-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to serious memory/OpenGL context leaks on Windows. No such thing has been noticed on Linux which may hint to differences in the backend. Task-number: QTBUG-47682 Change-Id: I274ed98db348ffe2c78707f2c92b812f272c2723 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-252-1/+61
|\ \ \ | |/ / | | | | | | Change-Id: Id85e82801b77faf9a32177838025696aab64f002
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-282-1/+61
| |\ \ | | |/ | | | | | | Change-Id: Ie81aa6abe8a4acbd201e4938f0cb693a8b3aa567
View Lorry Controller Status