aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-0814-0/+35
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0814-0/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
| | * Purge sRGB chunks from PNG in tests.Edward Welbourne2016-03-2912-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I9e4dc3aec97cd32bc8ac216fadeaf7669c49647c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * Remove empty .pro fileJoerg Bornemann2016-03-241-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia85ced87b9cb0ad2093bdfc4abcf222929bc8bd5 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| | * Handle duration of zero in QML animatorsDavid Edmundson2016-03-171-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle a duration of zero in animators using the same approach as animations. Task-number: QTBUG-39766 Change-Id: I1628292ad259ec5ec5d3bb0770440efa5fa6dad0 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | Blacklist tst_qquicktext::lineLaidOutRelayout() for MSVC 2015.Friedemann Kleint2016-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51934 Change-Id: I2b7aa4846e013f4fa498b7b997de01f53e03d625 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | tst_qquicktext: Ensure windows are cleaned up on test failure.Friedemann Kleint2016-04-071-25/+17
|/ / | | | | | | | | | | | | | | Use a QScopedPointer to guard them. Task-number: QTBUG-51934 Change-Id: I622fe782e0bd232cb1cc6ffc16499830b94334f2 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | QQuickItemView::forceLayout: Also call layout when d->forceLayoutAlbert Astals Cid2016-03-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | This way callers of forceLayout get a relayout if the dimension of a delegate that affects the itemview content size has just changed but the itemview content size has not been updated yet. This is useful because sometimes in the QML side you want to do things when the item view delegate size has changed but need the item view content size to be already updated. Change-Id: I846984a841e8e14c84d7a700a7ff736196b60afb Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | MouseArea: add source property to mouse eventShawn Rutledge2016-03-113-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It comes from the source() of the QMouseEvent which triggered it. This makes it possible to distinguish real mouse events from those that are synthesized from touch or tablet. And for this we need to import QtQuick 2.7 [ChangeLog][QtQuick][MouseArea] Added mouse.source property to enable distinguishing genuine mouse events from those that are synthesized from touch or tablet events. Change-Id: I568964f63981703bd23e05daac5288518f09d837 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-03-081-0/+22
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-0/+22
| |\| | | | | | | | | | Change-Id: Icfa1d61fcc286c3418d4a625de11d2191336fa60
| | * AnimatedSprite: don't access deleted scene graph nodesJ-P Nurmi2016-03-031-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It’s a bad idea to store a scene graph paint node as a member variable. First of all, it should not access the node outside updatePaintNode(), that is, outside the render thread. Secondly, the node is owned by the scene graph and may be nuked whenever the scene graph feels so. Some creative re-parenting easily triggers a case where AnimatedSprite ends up accessing a node that was already deleted by the scene graph. Change-Id: I89205ac36333a2fcb094121afa61b6409fda5883 Task-number: QTBUG-51162 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Particles: Shrink QQuickParticleData by 2 pointers.Erik Verbruggen2016-03-083-8/+8
|/ / | | | | | | | | | | | | | | Samegame creates about 23,000 particles, so this reduces the memory by ~180kb on 32bit, so ~360kb on 64bit. Change-Id: I0581524ab232b474c5d43abeabd7ebf6174e740f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Add more tests for pixel snapping of sizesJan Arve Sæther2016-03-021-0/+31
| | | | | | | | | | | | Task-number: QTBUG-41216 Change-Id: I4456709ec5c4e61183fb4056a5f6d6bd9bd863d5 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Change test because of slight behavior change in the layout engineJan Arve Sæther2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | The test was assuming that pixel snapping did not change the minimum size hint of the layout. An upcoming patch to qtbase will change that. Change-Id: I53bed57d086aa9ba9972188b014140c95d7669b9 Task-number: QTBUG-41216 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* | Make test more data drivenJan Arve Sæther2016-03-011-43/+21
| | | | | | | | | | Change-Id: Ia1c2d53c77da29337b4453046ddb3d526c7015e4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* | QQuickText{Edit,Input}: Reset selection when becoming readOnly.Robin Burchell2016-03-014-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When read only, controls may not be edited or altered, and indeed, a read-only control cannot acquire a selection (as it cannot be interacted with). Leaving an existing selection breaks that implication, so clear it when becoming read-only. [ChangeLog][QtQuick][TextEdit/TextInput] If a control has a selection, it is now cleared when becoming read-only. Task-number: QTBUG-51115 Change-Id: Ife43b97ee3d6b780f09a938868c3ccb2f1b6e6e7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-0112-1/+148
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro Change-Id: I3ca8f0422828191b7e19539c25f31f2d048e9f18
| * Properly signal errors when accessing lowercase enum valuesThomas McGuire2016-02-249-1/+94
| | | | | | | | | | | | Task-number: QTBUG-46758 Change-Id: I14e394021c231bda5552c8d1c98f20c903a62f12 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Validate Binding only when it is enabledNikita Krupenko2016-02-243-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | Not validate binding if it is disabled and validate when it became enabled. This helps to get read of warnings about not existing property that started to appear since 61ce37de40711ef2d4a6b4989d8183e1711fc47d. Task-number: QTBUG-48623 Change-Id: I4aa92896c04b146a79e606842c1d33661b3f5a70 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Move QtQuick.Layouts to qtdeclarative from qtquickcontrolsJan Arve Saether2016-02-266-7/+2013
| | | | | | | | | | | | | | | | This is in order for it to be available without having to install Qt Quick Controls Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Determine QQuickItem::childAt() correctlyKari Hautamäki2016-02-243-2/+114
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtQuick][QQuickItem] Fix to wrong calculation of child at a given point. Previously coordinates of width+1 and height+1 were counted as a child. That caused a child Rect of (0, 0, 100, 100) to be reported as a child at (100, 100), which is wrong (correct max coordinate is (99, 99).) Task-number: QTBUG-41833 Change-Id: I6124a275a5dc1a38eab448235102d563e2a8b0ca Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-1913-91/+350
|\| | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickitem.cpp tests/auto/quick/qquickgridview/tst_qquickgridview.cpp tests/auto/quick/qquicklistview/tst_qquicklistview.cpp Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-158-0/+179
| |\ | | | | | | | | | Change-Id: Ib4eb5c3572cb5ec11eb744572ec796dc7e70456d
| | * Fix crash in Installer Framework when used with Qt 5.6Simon Hausmann2016-02-021-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | IFW uses QQmlV4Function in a QJSEngine environment, so there is no QML context. Up to commit cc98678f404cd49750076795f39b31bfa36c80c3 that would work. Let's fall back to the root context as scope if we don't have a qml context. Change-Id: Ib240746a95a0d16d61620f97abc31e4c74f36723 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-026-0/+77
| | |\ | | | | | | | | | | | | Change-Id: I971229ff050c98258729ad70d9e06b89e5bbf617
| | * | QQuickItem: fix another infinite loop in nextItemInFocusChain()Liang Qi2016-01-307-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50516 Change-Id: I6a1513b22401b0fe45da758a239ad82038b83264 Reviewed-by: Zsombor Egri <zsombor.egri@canonical.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * | | GridView: Sanitize visible items after model insertionGabriel de Dietrich2016-02-132-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically the same patch as 35d8d060b8621cfd, but this time for GridView instead of ListView. The major difference is that GridView seems to do the right thing when the model insertions happen after the visible index. That explains the missing part of the patch in applyInsertionChange() as compared to the same function in QQuickListView. Also, QQuickGridView auto-tests are a bit more robust than their ListView counterpart. So no changes were necessary to existing test cases. Task-number: QTBUG-48870 Change-Id: I19b24c4d84a1a4cef4fdb3ddd3381d0c6b93a76a Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | Factor out testing code for QTBUG_48870_fastModelUpdatesGabriel de Dietrich2016-02-133-91/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to be reused for QQuickGridview's counterpart. Change-Id: I3eaf272229b0e45dfc8c0b78ba94d57c72f9cc5d Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | | | Add Window.window attached propertyJ-P Nurmi2016-02-122-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Window attached property exposes all kinds of window attributes, but not the window itself. Being able to access the window is often useful for various purposes. For example, in QML TestCase, to be able to access the window of the TestCase so that one can call various slots such as requestActivate(). Change-Id: Id03c9f277bb17810b41a60957011ccf07399e149 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-123-0/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
| * | | Fix Animators in itemview and positioner transitionsJ-P Nurmi2016-02-112-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In itemview/positioner transitions, Animator's target-property is never explicitly set. QQuickItemViewTransition passes the animation target as a "default target" instead. This change adds missing handling for the default target. QQuickItemViewTransition sets up default "x" and "y" state actions. If Animator drives opacity, scale, or basically anything else than x/y animations, it failed to extract the from/to values from the state action list. This change fixes the issue that if the default state actions do not match the animator property (x/y vs. scale/opacity), it uses from/to values specified on the animator itself. Before, it did that only if the default state action list was empty. This is not the case with itemview/positioner transitions. Change-Id: I0f15e20bc860ddec23e59efebbc9cd346317f4de Task-number: QTBUG-50908 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | Window attached property: fix notifier signalsJ-P Nurmi2016-02-021-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The change notifiers must be emitted when an item's window is reset. Otherwise any existing bindings don't get re-evaluated, and in worst scenario one ends up with dangling pointers. Change-Id: I6075957f1447bb8628d25bd822345e45837c027a Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | | QSGDefaultRectangleNode: Fix off-by-one color renderingJakub Adam2016-02-012-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit conversion from floating-point to int, which simply truncates the number's fractional part, may have caused the rectangle fill to be rendered in a color with some of its RGB components different by ±1 from the specified value. For example, the actual on-screen color of the following QML item was #010101 on 32bit Intel (no antialiasing or alpha channel): Rectangle { width: 100 height: 100 color: '#020202' } This commit improves precision of the calculation by applying qRound() before the conversion to integer. Change-Id: Ia849c31ba9872e7a92608245406d178051b21917 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2914-227/+229
|\| | | | | | | | | | | Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
| * | QML: do not wrap property values of type QVariant.Erik Verbruggen2016-01-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading a propety from a QGadget or a QObject, the values are stored in a QVariant and later unwrapped/converted to the correct JavaScript type. However, if the property value is a QVariant, it does not need to wrap it (again) in a QVariant. Change-Id: I633d3194f82b6032fc15d9994c4dee5e5609fd21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Don't check for revisions when assigning to grouped propertiesLars Knoll2016-01-274-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to wrong behavior in some cases, where we reject valid revisions, and there is probably no case, where this could lead to a conflict for the user of the API. Change-Id: I1614332cf4c07c6a227551612331dd69b2ae71f3 Task-number: QTBUG-40043 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Fix don't delete singletons objects owned by C++BogDan Vatra2016-01-251-0/+20
| |/ | | | | | | | | | | | | | | | | | | Don't delete singletons objects that are created only from C++ and have explicitSetObjectOwnership flag set, explicitSetObjectOwnership flag is set only by QQmlEngine::setObjectOwnership. Task-number: QTBUG-49865 Change-Id: I0ef658c2094e67b5cd9a1585e273144dfcee736a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Pass Qt.include() URLs through the URL interceptor if presentKevin Krammer2016-01-237-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | JavaScript files loaded by the Qt.include() function did not get passed through the QQmlEngine's URL interceptor, while those loaded by import statements did. Now both include variants have the resolved URL passed through the interceptor, e.g. an installed QQmlFileSelector Task-number: QTBUG-50483 Change-Id: Ife75e6b644687f3fb04048a311e570cdcbab8c6d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * tst_qquicklistview: Move a number of window instances to use scoped pointers.Robin Burchell2016-01-221-227/+115
| | | | | | | | | | | | | | | | | | These are exception safe (not that that matters greatly here) but more importantly idiot-proof. A number of tests weren't cleaning up windows properly before. Change-Id: Ieca676c8eea54d3c2a1d9e4738133acdb2b370fe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QTextEdit/QQuickTextEdit undo issue - Part #1Dan Cape2016-01-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change to the qquicktextedit testcase will match updated functionality for undo (made in qtbase) in the following scenario: If a user selected the text "foo" and typed "bar", upon pressing undo, the text would change to "b". This is incorrect and does not match the functionality of QTextEdit or the default behaviours of Windows/OSX/Ubuntu. When pressing undo on QTextEdit, the text would change back to "foo". The changes to the testcase is basically removing one step in the undo test data that does not happen anymore. Since the change to undo was made in qtbase, I need to disable the undo test cases using the BLACKLIST until the qtbase change is in. Then there will be another review to re-enable it. Task-number: QTBUG-38825 Change-Id: I60e799d546945aac89634b49b2e1dc60a2a68935 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devSimon Hausmann2016-01-229-12/+309
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-229-12/+309
| |\| | | | | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| | * Clean up QV4DataCollectorUlf Hermann2016-01-221-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to pass debuggers and engines around as the data collector already has all the necessary information. Also, the exception collect job is only used in the test case, so we don't need to define it in the collector. Change-Id: I3197dd5c2d99e95465aa787097c6f8bf8aee794e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * V4 Debugger: Avoid looking up values in debugger threadUlf Hermann2016-01-221-65/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid interaction with the engine from the debugger thread we move the value lookup functionality into the data collector, and drop the RefHolder. Also, we define some more debugger jobs to move the work the request handlers do into the GUI thread. Task-number: QTBUG-50481 Change-Id: Ia73ebd01e715f13110ef010a766e9b0a1e202df9 Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2016-01-212-0/+42
| | |\
| | | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-192-0/+42
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ieb48911638b5c1acdfd4dee8aa19dca9be99a1f6
| | | | * MouseArea: fixed a crash in propagate()Liang Qi2015-11-262-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not propagate without window. Task-number: QTBUG-49100 Change-Id: Ieda3a8357283f8d07d4ffc0cc62c4e15645d7e5a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | | QQuickItem: fix an infinite loop nextItemInFocusChain()Liang Qi2016-01-202-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When isTabFence is set to true and no children. Task-number: QTBUG-50516 Change-Id: I8430336fde7ab041797f8f9d9dfe5b9d56fecddd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | | Provide access to signal parameters in SignalTransition::onTriggered.Michael Brasser2016-01-192-0/+159
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib74d3f5e9a357a86b818e27dd7249e2ecdf1e513 Task-number: QTBUG-46897 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 03:58:47 +0000