summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.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>
* | | Remove test exclusion of Tests_CircularTickmarkLabel::test_tickmarksAndLabelsSimon Hausmann2016-08-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug is fixed now in declarative. Task-number: QTBUG-54394 Change-Id: I5fcc39125eca2bca3c597fc472b596dc317275e5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-305-1/+168
|\| | | | | | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-275-1/+168
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| | * Fix moving of TreeView itemsJoni Poikelin2016-08-262-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property binding for row property in styleData causes an update which tries to read new value for the index property, but index is changed afterwards which causes old value to be read. This may lead to crashes and other unwanted behavior. Depth changes are now delivered to update item depths in visible items and model index changes though role instead of looking for a row change. Task-number: QTBUG-47523 Change-Id: I540cd06a25281f18e4628f4b030cf969dc8e0a7f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Update scroll indicator position on content size changeNikita Krupenko2016-08-183-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Revert "Blacklisted Tests_PieMenu::test_triggerMode() in extra"Liang Qi2016-08-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was fixed by 651ecf9ae413478af622761e89347bb4e6243e0c in qtdeclarative. This reverts commit 817d6971ebf75d0b276a93e1ee15d4826ba76c30. Task-number: QTBUG-55325 Change-Id: Ic9e730c65d613fcbb3c1b2a7ff86689c6f39ec12 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Blacklisted Tests_PieMenu::test_triggerMode() in extraLiang Qi2016-08-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55325 Change-Id: Id21ae3ba9e4de8bb7a22507261f6effbc8ec95d8 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-024-2/+108
|\| | | | | | | | | | | | | | | | | | | | 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>
| * | Find custom styles from custom paths when set afterwardsDavid Faure2016-07-062-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the very frequent warning from plasmashell: WARNING: Cannot find style "Plasma" Change-Id: Ibe853e7b8b42adc2bce7c63a1505b27898ea5ffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Find custom styles stored in qrc.David Faure2016-07-062-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unittest was showing that it was looking in <CURRENTDIR>/qrc:/qt-project.org/imports/QtQuick/Controls/Styles which makes no sense. In addition, the code was only listing the directory where the default style is found. When the custom style is elsewhere, it needs to be looked up in addition. Change-Id: I93eddab73672c575cd92037e1d0b366cf17540ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@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>
* | | Blacklisted a few qml tests in extra.Liang Qi2016-06-281-0/+8
|/ / | | | | | | | | | | | | | | | | | | extras::Tests_CircularTickmarkLabel::test_tickmarksAndLabels() and 3 in extras::Tests_Tumbler. Task-number: QTBUG-54394 Task-number: QTBUG-46393 Change-Id: I0e033e0d9a721141d404a8081cf2ac0777876595 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1015-22/+221
|\| | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * tst_extras: skip crashy test_resize() on WindowsJ-P Nurmi2016-05-031-3/+5
| | | | | | | | | | | | | | Task-number: QTBUG-53123 Change-Id: If7b33d46828808d869a7e325a908a8a353c35f57 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * tst_extras: skip crashing test_resize(PieMenu)J-P Nurmi2016-05-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | This has been consistently blocking the qt5 integration, and nobody is able to reproduce the crash locally or when running tests manually in the CI. We don't even know where exactly it crashes, but this change skips the test that we assume to be problematic. Change-Id: Ia5665a542890b90a296d5d068c14e78fc9c3c625 Task-nubmer: QTBUG-53123 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * tst_extras: change QML TestCase visibility bindingsJ-P Nurmi2016-04-298-8/+8
| | | | | | | | | | | | | | | | | | | | Let QML TestCase be implicitly shown together with the internal test window. The visibility binding to windowShown is unnecessary, and might cause extra visibility state changes, which in turn may cause other issues further down the chain. Change-Id: I59654c4035185ddcbc1e2c4c231f9a6d76d12383 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * make use of COPIESOswald Buddenhagen2016-04-281-6/+3
| | | | | | | | | | Change-Id: I232cf933b20e53ea7403a993edfe00c5eda5a0b1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * tst_extras: create animation as child of controlJ-P Nurmi2016-04-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...and let it destruct together with the control. tst_extras::Tests_Common::test_resize(PieMenu) is constantly crashing in the Win 10 CI. This is a random shot attempting to solve the crash. We're not able to reproduce the issue locally or even when running the test manually on the CI. Change-Id: Iee717cdcf4b05273c05833856a9b5fd18443ca82 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Increase window size in tst_gauge.qmlMitch Curtis2016-04-271-1/+1
| | | | | | | | | | | | | | A width of 60 is too small on Windows, and was causing warnings. Change-Id: Iae4f643fcc9c30a561720b653151cad7ba6d0f20 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve DialStyle's valueToAngle() tests and documentationMitch Curtis2016-04-181-0/+10
| | | | | | | | | | | | | | | | The minimumValueAngle and maximumValueAngle variables it mentions are private. Change-Id: Ib95c96aeb218c8624857c212429f6c4e4e77ece2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Dialog: allow proper resize and default size for contentAlberto Mardegan2016-04-134-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Dialog use implicitly positioned items as content. This makes impossible to use item, that can be properly resized with change of dialog window size and has proper default size (set implicit width and height). This change made it use implicit size if there is one item or fallback to previous algorithm, that use childrenRect for explicitly sized and positioned items, so it won't break behavior of the existing applications. [ChangeLog][Dialog] Proper resize and default size for content Task-number: QTBUG-49058 Change-Id: I7fa4da7d5fd39d47f60ba9f43c88f78e75739b0a Initial-patch-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * 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>
* | Add support for QT_QUICK_CONTROLS_1_STYLEJ-P Nurmi2016-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. [ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE environment variable, which takes priority over the existing variable QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-083-0/+0
|\| | | | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Purge sRGB chunks from PNGs in tests.Edward Welbourne2016-03-293-0/+0
| | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (Some needed -force but did get smaller.) Change-Id: I56774d04c4a0397ae183cd70d8edd7f9f0cfcb22 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Make tst_piemenu compatible with QML SignalSpy changesJ-P Nurmi2016-03-211-7/+7
| | | | | | | | | | | | | | See qtdeclarative 2e7d4ec. Change-Id: Ib2a0562a2810127924f0a80253fb93518aa511e5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Controls: append "1" to all C++ classesMitch Curtis2016-03-181-33/+33
| | | | | | | | | | | | | | | | | | | | This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-163-12/+47
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/dialogs/qquickabstractfiledialog.cpp src/dialogs/qquickfiledialog.cpp Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
| * Extend manual test viewinqwidget.Friedemann Kleint2016-01-273-12/+47
| | | | | | | | | | | | | | | | | | | | Show both QQuickView/createWindowContainer and QQuickWidget. Make it work with shadow-builds by passing the full path of the source via define. Task-number: QTBUG-49097 Change-Id: Idbad3a28ae4f803fea57e94c5750224fa5aa1e1e Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-04129-387/+1677
| | | | | | | | | | | | | | Updated BSD license headers Change-Id: I73d67dbc6dbbe7c58d2b9c301b46fb6163243095 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0429-522/+290
| | | | | | | | | | | | | | | | 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-215-1/+193
|\| | | | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Import tst_objectcount benchmark from qtquickcontrols2J-P Nurmi2015-12-233-0/+178
| | | | | | | | | | Change-Id: Id898b5e3d5182ee6dcb09758298d4cb0fed3bea8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * 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>
* | Remove insignificant flag from dialogs testTony Sarajärvi2015-12-041-3/+0
| | | | | | | | | | | | | | Task-number: QTBUG-30513 Change-Id: I6a3220237898400d756edf7b3894006e6b4e6e3b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-025-4/+65
|\| | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_menubar.qml Change-Id: I23c3299e6f6cef14093aa4f79b3e7d769c063064
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 14:18:50 +0000