aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-0419-84/+498
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4engine_p.h src/quick/items/qquickitemsmodule.cpp src/quick/items/qquicktext.cpp src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
| * tst_qquickwindow: Prospective fix for instability of cursor test.Friedemann Kleint2015-06-031-45/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FAIL! : tst_qquickwindow::cursor() Compared values are not the same Loc: [tst_qquickwindow.cpp(1444)] Check that no windows are leaked in slot cleanup and fix all leaking tests. Position the window and enlarge it to fix the warning: WARNING: tst_qquickwindow::cursor() Mouse event occurs outside of target window. Add window titles to tests. Replace QVERIFY(a == b) by QCOMPARE(a, b). Change-Id: Ida892e8a8d7d5f40d4f50787608940dbffc7a29d Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * Makes it possible to extract all data from a QML DropAreaAleix Pol2015-05-231-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | There's many types that aren't being covered by DropArea API, such as images. getDataAsString is not acceptable, since fromUtf8 chokes on reading non-utf8. This patch introduces getDataAsArrayBuffer method that won't try to convert the data into a QString and simply pass a QV4::ArrayBuffer, that internally keeps a QByteArray. Change-Id: I65411b3d365ee6c5e13effd9167156771ee08a05 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * qquickwindow: ensure we delete the correct delayed touch event after deliveryRichard Moe Gustavsen2015-05-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delivering a delayed touch event from QQuickWindow can cause the event loop to recurse (e.g if it starts a drag'n'drop). This again can cause new touch events to be delivered to QQuickWindow, and new delayed touch events to be stored. This results in the following: (1) Receive new touch press event in QQuickWindow, and set delayedTouch to be a copy of it (2) Deliver delayedTouch to items. This can cause an event loop recursion. (3) While inside the recursion, QQuickWindow receives another new touch press event. We then redeliver and delete the current delayedTouch event created in (1), and set delayedTouch to be a copy of the new event. (4) Later we return back from (2), and try to access delayedTouch (or actually a reference to the touchpoints inside it, qquickwindow.cpp:1958). Since the event was deleted in (3), we have a crash. This patch will ensure that we set delayedTouch to 0 before delivering it (so it cannot be redelivered), and that we safely delete it afterwards when it goes out of scope. By converting delayedTouch to a QScopedPointer we also ensure that the event is not leaked upon destruction. Task-number: QTBUG-45877 Change-Id: Ic372a39a0eb127abfd12cec2d51b3743ad83194d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Hide cursor when text fields becomes read onlySanttu Lakkala2015-05-121-0/+2
| | | | | | | | | | | | | | | | | | | | Clear the cursor node in TextEdit if field is read only. Otherwise the cursor stays visible indefinitely, if it were at the moment the flag was set. Task-number: QTBUG-44735 Change-Id: Ib39138260ad8a4d7e5ed2185b8a04c577ee1eff0 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Avoid namespacing QTEST_MAINRainer Keller2015-05-086-35/+95
| | | | | | | | | | | | | | | | | | | | The test tries to be smart but it won't work once GPU blacklists are supported because QTEST_MAIN will contain some imports that cannot be namespaced. Change-Id: Id0538cf1ba3885736d8b177e64064bd06f8fef2e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * BorderImage support for @2x assetsAndy Nichols2015-05-065-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite being a subclass of QQuickImageBase, BorderImage components did not support using @2x assets like Image components. The 9 patch image logic now accounts for device pixel ratio when needed. Manual tests added for stretch, repeat and round tiling modes. [ChangeLog][BorderImage] Add support for @2x HiDPI border images. This means, no more need to multiply the border sizes by the device pixel ratio. Change-Id: I79958739929964c816ba5dacedd9eaf93a60a183 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| * Fix implicitHeight for Text items bindings dependent on implicitWidth.Andrew den Exter2015-05-042-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | Recalculate the implicitHeight on the second layout if the width changes after setting the implicitWidth, and potentially do another layout if the updating the implicitHeight changes the height. Change-Id: Ib6a637452013b56dba7ae8a6862cd92156386578 Task-number: QTBUG-45546 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4' into 5.5Simon Hausmann2015-05-041-0/+21
| |\ | | | | | | | | | Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4
| | * Fix passing of locals as function arguments with side-effectsSimon Hausmann2015-04-301-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 75c22465cf8fe262edfe6178bb9ca19661fb710e regressed in allowing locals and arguments to be passed directly as further arguments to function calls, but that's incorrect when considering var i = 2; testFunction(i, i += 2) where it is instrumental to place the first argument into a temp (making a copy) instead of passing it directly. Change-Id: Iffcf6c6eda92a8fb665982cda1db0b96359cd092 Task-number: QTBUG-45879 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Fix default value for XMLHttpRequest.response propertySimon Hausmann2015-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value for responseType is the empty string, for which the expected data type for the response property is a string - same as when the response type is set to "text". In other words: By default the response property should contain the string representation of the data. Task-number: QTBUG-45862 Change-Id: I563160e5cdfbf93aca7e283e455d77a6b9deceb4 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Valery Kotov <kotov.valery@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Remove ordered list assumptions in PathViewAlan Alpert2015-05-182-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When flicking fast or jumping around on paths with some items not seen, the current algorithm makes assumptions about list ordering which are hard to maintain. Specifically that it has the index of the first item in the list cached and that all changed will be to either prepend or append an item to the current ordered set. This patch removes that assumption, leading to a little more work each time to identify where new elements will go. There is still a slightly faster path for the common case of adding elements to the beginning or end of the path. Task-number: QTBUG-42716 Change-Id: Ief76c93967d254d405e6656ef27d06b4ecc470c8 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Column, Row, Grid, Flow: add support for paddingLiang Qi2015-05-188-53/+2418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtQuick] Added padding, leftPadding, topPadding, rightPadding and bottomPadding properties in Positioners, including Column, Row, Grid and Flow. Task-number: QTBUG-41559 Change-Id: If3be7b2243a79c01dad0a5600e22d30eeea43c8a Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* | | Potentially stabilize tst_qquickwindow::touchEvent_cancelFrederik Gladhorn2015-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By moving them well into the item, (50 instead of 10 pixels) there is less risk of them not being delivered due to bad timing with window activated. Since we know that even qWaitForWindowActive sometimes returns before the final positioning of the window, this is a sensible work-around until testlib is fixed. In this test we care about the process of cancelling a touch event, not where. Change-Id: I74ad29535038995b38c913ddd09f462aa96a034c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Enable mipmap test on all platforms, except early Mesa.Gunnar Sletta2015-05-131-8/+11
| | | | | | | | | | | | | | | Change-Id: Ib6e17755cdb281de164c9eb79c3b0eeca391c291 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | QMLEngine: Update XHR tests with checking status codeValery Kotov2015-05-054-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update QQmlXMLHttpRequest unit tests with checking status code in resopnse message. Task-number: QTBUG-45581 Change-Id: Ia9fdb4463582bdb098be5d0cab022993904a3d51 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-04-2853-301/+493
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-04-2853-301/+493
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicktext/tst_qquicktext.cpp Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
| | * | Merge remote-tracking branch 'origin/5.4' into 5.5Simon Hausmann2015-04-2747-277/+381
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11
| | | * Prospective fix for flakey "network" related QML testsv5.4.2Simon Hausmann2015-04-2543-267/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace hard-coded server ports with dynamically allocated ports. Change-Id: Iab8f9a88343a9f2c49af3cd700c954c13c3bf121 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | * | Instantiator: Make asynchronous mode workGabriel de Dietrich2015-04-252-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch proceeds in two steps. First, and the most trivial, we make sure not to offend the Instantiator's objects container since asynchronous creation also means the objects can be created in any order. We do so by ensuring the objects container has always the necessary size. The second step is to make sure the objects don't get destroyed by the delegate model when their incubation tasks are asynchronous. We force to keep an extra reference calling the object() function on the instance model, but only if the creation was asynchronous. However, it's not enough to check for the Instantiatior async value since the incubation tasks in QQmlDelegateModel are async-if-nested. Therefore, we need to keep track of the object index requested to the model and see if it matches when the createdItem() signal gets emitted. Task-number: QTBUG-36410 Change-Id: I180b03b6a7468d6521827a9631755577e9e6d357 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | Fix regression with nested objects served by custom parsersSimon Hausmann2015-04-232-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following piece of code used to work and broke with Qt 5.3: ListModel { property var conn: Connection { ... } } When validating the properties of the ListModel we would not validate the Connection sub-object here, which meant the custom parser for the connection object was never called. We need to extend the logic for sub-object validation to recursive into sub-objects when this is either an attached property (Component.onComplete on a list model for example) or the object is assigned to an _existing_ property, i.e. a property not deal with by the custom parser. In this case that's a custom declared property. Change-Id: Ic99f746f08771460cc6424a9e8a839c78a7eafd9 Task-number: QTBUG-45735 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | Make the scenegraph_lancelot test work on MacEirik Aavitsland2015-04-232-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grabbing the window after every frame is needlessly expensive and would overload a less powerful Mac. Rewrote the grabber to just do the necessary grabs. Make the hostinfo script not output the unneeded '[undefined]' value for unset environment variables, as the braces would upset the paths in the html report. Change-Id: I76104235c15eafd5e7f92f2ec01c84f5b11b55a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | | Make Repeater emit items with right stacking orderJan Arve Saether2015-04-282-0/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When listening for Component.onCompleted on the items emitted by the Repeater, the items' stacking order was not properly set up. The stacking order was corrected after Component.onCompleted was emitted, which was undesirable in some cases. Task-number: QTBUG-45423 Change-Id: Ib96b3de81db556b09fb5fc8bd27ce19223014f7e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Simplify binding setup code furtherLars Knoll2015-04-271-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of setBinding/removeBinding overloads and simplify their internal handling. Change-Id: I87174a3b2dc0ecb8380e8fc28f8969fbf475c728 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Get rid of QQmlAbstractExpressionLars Knoll2015-04-241-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | The class is always used together with QQmlJavaScriptExpression, so we can just as well fold the functionality together into one class and simplify our code. Change-Id: I23820e51efaaea16ae5db7e2153a827d7b22999e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Move exceptionValue and globalObject from the Engine onto the JS stackLars Knoll2015-04-242-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We'll need to move all GC'ed objects currently stored in ExecutionEngine onto the JS stack for easier management in a new garbage collection scheme. This is the start of that change. Change-Id: Ib3ad8e846875dade8a807ea79f063173d40e4aad Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.hLars Knoll2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is a cleaner separation and further reduces include dependencies in the definitions of our basic data structured. Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Skip the remote image source test and fix blacklisting of the other testsSimon Hausmann2015-04-233-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's a deadlock in qdbus that we're hitting with remote tests. We should skip it and the other tests, but only on Linux. Task-number: QTBUG-45655 Change-Id: I4523fdaa2c8855c5029667fb0e32b99ec563af27 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-2218-18/+625
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlbinding.cpp src/qml/jsruntime/qv4arraybuffer.cpp src/qml/jsruntime/qv4functionobject.cpp Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
| * | add manual tests for touch interactionShawn Rutledge2015-04-216-0/+608
| | | | | | | | | | | | | | | | | | | | | | | | So far there are manual tests for Flickable and MultiPointTouchArea. It can be expanded later. Change-Id: Ifa838b68f137a49647a208dc15f22c90f1e02d1f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | rename manual test dir shorcuts -> shortcutsShawn Rutledge2015-04-171-0/+0
| | | | | | | | | | | | | | | Change-Id: Icdd494fb6c561b15d3cccb925b84990163c77bf2 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-1611-18/+17
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
| | * Use qt_subtract_from_timeout instead of duplicating qt_timeout_valueDaniel Teske2015-04-1410-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | The same function was duplicated 5 times in qtbase, so create one copy to rule them all and use it also in QtDeclarative. Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * tst_qquickapplication: change test case 'state' to be more stableRichard Moe Gustavsen2015-04-081-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt-5.4 integration can sometimes fail on this test. We have not succeeded reproducing it, but from reading the test code, it seems likely that the problem might come from already pending state events queued before the test starts. Since the test cannot know if the platform will queue state events while spinning the event loop (waitForEvents), this patch will instead only flush already queued events, which should be less prone to side effects. Change-Id: I134f98ba35faa4d9213ee658ebcbe76b390b5516 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | More cleanupsLars Knoll2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Get rid of Value::asObject(), and pass const Managed pointers into some more vtable methods. Change-Id: Ia4f427d5fd8868f77b4015d1ce5424d32bfc2115 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Stabilize QQuickWindow testSimon Hausmann2015-04-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various test functions use QTest::touch* and QTest::mouse* to synthesize touch/mouse events. The synthetization relies on the QWindow to be globally positioned (with regards to the window manager), as it performs a translation of the supplied window coordinates to global coordinates. If this happens too early in the window mapping process, we end up with wrong global coordinates, that in turn mean that when the event is mapped back to the window coordinates later, it has the wrong coordinates and not what the test expects. qWaitForWindowActive tries to accommodate this case by waiting until the positioning of the window is "complete", as opposed to qWaitForWindowExposed, which returns as soon as we have a rendering surface. The symptom in the CI system was that when this race condition hit, the y coordinate of events was off by 28 pixels on Ubuntu machines, which appears to be the height of the title or menu bar. Therefore this patch changes test functions that synthesize events to use qWaitForWindowActive. Change-Id: Ia8ecff517f4eefb15068ca1c342ef6666681c362 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Extend blacklistSimon Hausmann2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | stopAtBounds also fails on 64-bit machines, as seen in http://testresults.qt.io/logs/qt/qtdeclarative/aa44b0fe7e7a72ec4257b338938e1ec3b7aee1e1/windows8x86_64windows8x86_64msvc2013developer-build_release_build-examples/6da9f7a63d5f4ce18e85b7a72ff0e888f3446352/testlog.txt.gz Change-Id: If8ac78bdb3b1e66106644efc19ef8fd018aac66e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Skip some tests that are hanging in the CI systemSimon Hausmann2015-04-212-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is most unfortunate that those tests are hanging, but in order to move forward we temporarily skip them. Task-number: QTBUG-45655 Change-Id: I9fae6c21ca3b5c7eb6715d520bd58e366136ed58 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | TestCase: add equals() function to QuickTestImageObject.Mitch Curtis2015-04-211-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for comparison of image objects returned from TestCase's grabImage() function using QImage's operator== function. Doing pixel by pixel image comparisons in QML is extremely slow. This functionality is useful for checking that an item was redrawn after a property change, for example. [ChangeLog][QuickTest][TestCase] Added equals() function to image object returned from TestCase's grabImage() function. Change-Id: I0ece9df6effe2b1b9d8e1ee8ac011115d9367ef2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | QML Engine: JSON XHR response type supportValery Kotov2015-04-165-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for "json" response type for QQmlXMLHttpRequest was added. [ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now supports "json" binary response type. Change-Id: I21b7659c02dfdc6b64a73e1d2003e269d90b3b23 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Added a new render job stage: NoStageMiikka Heikkinen2015-04-151-13/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NoStage allows scheduling jobs for immediate execution on the renderer thread. [ChangeLog][QtQuick][QQuickWindow] Added a render job stage: NoStage Task-number: QTBUG-44953 Change-Id: I918c79f1d095bc27d911a88d81376d146a04313c Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
* | | Stabilize tst_qquickimage::noLoadingSimon Hausmann2015-04-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test loads an image from a remote source and it has a QSignalSpy installed for the progressChanged(qreal) signal on the QQuickImage. The test counts the number of times the signal is emitted and expects it to hit an exact value. That seems wrong when loading an image over the network, as we have no control over in what pieces the data arrives on our end. And as it turns out, the test occasionally fails in the CI system, which is also reproducible. To stabilize the test, we now expect at least two emissions of the signal when loading from the network (0% and 100%) but there may be more (0% 10% 80% 100% for example). In addition the reload case is simplified by resetting the spy and verifying that progressChanged was not emitted at all. Change-Id: Ib2e660651d40b92eff889ebe3baabb74d6e00fb4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-1327-456/+395
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/BLACKLIST Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5
| * | Tests: Use blacklist instead of insignificant for tst_qquickanimationsCaroline Chao2015-04-102-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file. Blacklist the relevant tests, the tests that have been found flaky in CI. Change-Id: I4c3ce430e654886ceea8b6f714710ebe2374e4db Task-number: QTBUG-45466 Task-number: QTBUG-29062 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| * | Tests: Use blacklist instead of insignificant for tst_qquickflickableCaroline Chao2015-04-102-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file. Blacklist the relevant tests, the tests that have been found flaky or failing in CI. Change-Id: If145b9bc413e4c9dbf1c3c06c1596647c707770e Task-number: QTBUG-36804 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| * | Fix TextEdit when vertical alignment != AlignTopEskil Abrahamsen Blomfeldt2015-04-091-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the TextEdit's alignment was either AlignBottom or AlignVCenter, several things would be broken: First of all the position of all non-dirty nodes would not be updated, so if you e.g. added text to the end of the document, it would overlap with the previously added text. Also, the frame decorations were always aligned to the top, since the basePosition was not accounted for in the node for this. The fix is to translate the root node to the base position instead of baking this into the position of the text nodes. This also automatically fixes frame decorations since it's already aligned to the top of the root node. [ChangeLog][TextEdit] Fixed issues with using other vertical alignments than AlignTop. Change-Id: I11f73eab21a28658a5cbf00292fd519efd0f3e7f Task-number: QTBUG-45032 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Tests: Make qquickcustomparticle significant againCaroline Chao2015-04-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | The test is passing in CI and it seems it was temporarily made insignificant in 5a4eebbc. Change-Id: Ic53d45b842c9a9c431a43cb6d5cbd3849e5729ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Tests: Make qquicktrailemitter significant againCaroline Chao2015-04-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The test is now passing in CI. Change-Id: Iad7dc46e7819ba9e9f604ed39ab9bc53f123b119 Task-number: QTBUG-33421 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * | Tests: Make qqmldebugjs significant againCaroline Chao2015-04-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The test is now passing in CI. Change-Id: I9414e05d40fe373878afa43121fcfa7cf95fcbdf Task-number: QTBUG-28263 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:50:00 +0000