aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"Jani Heikkinen2017-09-042-60/+51
| | | | | | | | | | | | | It seems this is causing QTBUG-62925 and QTBUG-62926 so revert is the best option at this point to proceed This reverts commit 4c46dce8fd9c9dddddd1d07f56396b3eabb2efc4. Change-Id: Ia8ea85c1ac1ada1752b29c9fbd8439f5963d46d2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Make QtQuickTest::mouseEvent use QTest::mouseXAlbert Astals Cid2017-08-302-51/+60
| | | | | | | | | | | | Fixes QQuickItem::isUnderMouse returning wrong information when moving the mouse cursor with QtQuickTest::mouseX Also changes TestCase.mouseDrag to actually resemble more what real life does, i.e. send mouse moves with the same localPos if the item has already moved and update tst_drag.qml accordingly Change-Id: I80e4ab097da90d21ba987466c1b82467755a6b56 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix crash in QQuickAnimatedImageAleksei Ilin2017-08-101-0/+43
| | | | | | | | | | Check d->_movie pointer before dereferencing Task-number: QTBUG-62380 Change-Id: I62314c7c0d4a7e41fa6f8c4629d16f30d6036156 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-08-082-0/+9
|\ | | | | | | Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9
| * Add very basic compressed texture supportMichael Brasser2017-08-072-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow direct loading of pkm texture files into Image. This can be extended to additional texture types, and then eventually turned into a full plugin architexture. [ChangeLog][Qt Quick] Allow direct loading of pkm texture files into Image. For example: Image { source: "myImage.pkm" } Change-Id: I1baed6c3e85a15752da8adc675482d874c9355ab Task-number: QTBUG-59872 Task-number: QTBUG-29451 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerJan Arve Saether2017-07-116-52/+162
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/shared/LauncherList.qml src/quick/items/qquickevents.cpp src/quick/items/qquickevents_p_p.h src/quick/items/qquickwindow.cpp tests/auto/quick/touchmouse/tst_touchmouse.cpp Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b
| * Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-151-0/+62
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4codegen.cpp Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9
| | * qmltest: fix compare() for urlsLiang Qi2017-06-141-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | url is object, but without any property. Task-number: QTBUG-61297 Change-Id: I68b0523be54e4d42f57267205ba8d66ff4ac4e30 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-063-51/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/jsruntime/qv4argumentsobject.cpp src/qml/jsruntime/qv4arraydata.cpp src/qml/jsruntime/qv4context.cpp src/qml/jsruntime/qv4context_p.h src/qml/jsruntime/qv4errorobject.cpp src/qml/jsruntime/qv4functionobject.cpp src/qml/jsruntime/qv4internalclass.cpp src/qml/jsruntime/qv4lookup.cpp src/qml/jsruntime/qv4managed.cpp src/qml/jsruntime/qv4managed_p.h src/qml/jsruntime/qv4object.cpp src/qml/jsruntime/qv4object_p.h src/qml/jsruntime/qv4qmlcontext.cpp src/qml/jsruntime/qv4runtime.cpp src/qml/jsruntime/qv4vme_moth.cpp src/qml/memory/qv4heap_p.h src/qml/memory/qv4mm.cpp src/qml/memory/qv4mm_p.h src/qml/memory/qv4mmdefs_p.h src/quick/scenegraph/util/qsgdistancefieldutil.cpp src/quick/scenegraph/util/qsgdistancefieldutil_p.h tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp Change-Id: I7ed925d4f5d308f872a58ddf51fdce0c8494ec9c
| | * Fix licensingJani Heikkinen2017-05-043-51/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one Task-number: QTBUG-57147 Change-Id: Ib59c3e2e39bfe0038db795af85dc75028564efa3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | tst_grabImage: Some work on looking into flakinessRobin Burchell2017-05-111-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Compare old and new image sizes (to make it obvious if size is the part that breaks) * Make use of the new save() functionality to dump images when it fails Task-number: QTBUG-53793 Change-Id: I772fe4078b5a2f87aa33ceab35103ff07ee19ab2 Reviewed-by: Gunnar Sletta <gunnar@crimson.no>
| * | TestCase: Grow some new functionality on grabImageRobin Burchell2017-05-112-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some meta-information about the image that we can use to do slightly stronger checks than just blindly poking pixel data (width & height props). In addition, when a test of a grabbed image fails (which they certainly do), it is always nice if we can perform some diagnostics. To this end, add a save() method to save the grabbed QImage to disk. Tests for the new functionality are blacklisted on Linux at present, as they do not yet appear stable, inheriting the other tst_grabImage flakiness. [ChangeLog][QmlTest] The returned object from TestCase::grabImage now has 'width', 'height', and 'size' properties for additional verification. In addition, there is a save() method to be able to persist the grabbed image to disk (for diagnostics purposes, for example). Change-Id: Ic651e0257102c514c39c3f648c05870f9d9c52e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-05-0837-62/+81
|\| | | | | | | | | | | Change-Id: Ia06843de255547174efa556b1ab76be4b4be4287
| * | Merge remote-tracking branch 'origin/5.9' into devLars Knoll2017-05-022-3/+3
| |\| | | | | | | | | | Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
| | * Rename macos blacklistings to osxTony Sarajärvi2017-04-241-3/+3
| | | | | | | | | | | | | | | Change-Id: I7b31408b066054bde72402eb4602debbfdad7c1d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | tst_grabImage: Small improvement to avoid accidental leakage of ItemsRobin Burchell2017-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If the test fails for some reason, ensure that they are cleaned up properly by using TestCase's item creation instead of doing it directly. Change-Id: I639bd246662260f31d5a32d140ee98ad11884446 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Re-blacklist an unstable testRobin Burchell2017-04-222-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I accidentally attributed this to the wrong BLACKLIST in 186cbe30939947e3a2d33b250fc861cbee361dfe, which meant that it was running incorrectly. Change-Id: I64b9d322829736da0a05b03ccacb4e08fff863df Task-number: QTBUG-60343 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | qmltest: Split into separate testsRobin Burchell2017-04-2037-62/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running everything in one big process has high risks of problems caused by globally mutable state. It also makes running small subsets of the tests more painful than it needs to be. Make use of the new QML-only test support in qtbase to have one project per subdirectory instead. This means no more C++ "stub" binary (just run make check or qmltestrunner in the directory). This relies on qtbase/727da2965caa8bccf8bbfbdd571ed05b35251f82. Change-Id: I0da70dba19aa54e456cd183b4b6b245ee20b1f3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Blacklist ListView::test_listInteractiveCurrentIndexEnforce completelyShawn Rutledge2017-04-141-2/+1
| | | | | | | | | | | | | | | | | | | | | It has failed on Windows too. Change-Id: I539ffacaedcc62339e2017e2272297c9bc3846cf Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-04-132-0/+15
|\| | | | | | | | | | | Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4
| * | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-04-071-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jit/qv4assembler.cpp src/qml/jit/qv4assembler_p.h src/qml/jit/qv4isel_masm.cpp src/qml/jsruntime/qv4vme_moth.cpp Change-Id: I865d794e550a263387a39ca8d051ebf48b70cbc0
| | * Blacklist TextEdit autotests on macOS 10.12Tony Sarajärvi2017-03-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | TextEdit::test_textentry and TextEdit::test_textentry_char fail on macOS 10.12. Task-number: QTBUG-58972 Change-Id: I3d9e4db3a3243ab9a5e373c9cdb23200d80232bd Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Error out if TestCase.verify receives more than 2 parametersAlbert Astals Cid2017-04-051-0/+10
| |/ | | | | | | | | | | Change-Id: I3299f602970067aaef290d4f1c7449d3ab03fb3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Blacklist a qmltest::ListView test in macOS 10.12Tony Sarajärvi2017-03-231-0/+1
| | | | | | | | | | | | | | | | | | Precise name of blacklisted test: qmltest::ListView::test_listInteractiveCurrentIndexEnforce() Task-number: QTBUG-58971 Change-Id: Iac01f0a5c31c91b08438fd6d7601bdb2ced41ac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-02-023-9/+40
|\| | | | | | | Change-Id: I734539161beb99d37b9d297c536ae154c888b736
| * Merge dev into 5.9Oswald Buddenhagen2017-02-011-4/+37
| |\ | | | | | | | | | Change-Id: I8436b1be632b80aae340cc692795ba86b4e3e79b
| | * Make Item::grabToImage work in more cases, and improve test coverageAlbert Astals Cid2017-01-271-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression caused by 9c50216c7bbbdb2bb51d4485286bf09e12fb5b62 when the Image specified fillMode: aspectRatioCrop/Fit. [ChangeLog][QtQuick][Image] Item::grabToImage on an Image element will now work regardless of the Image's sourceSize or cache properties. Change-Id: I225854c48f0c35a3cb2ef0dd56bf51bd88c31779 Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
| * | fix test_mouseDrag on RHEL 7.2Shawn Rutledge2017-02-012-5/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouseDrag(item, x, y, dx, dy, button, modifiers, delay) in TestCase.qml adds intermediate mouseMove events if dx or dy is too large (specifically if Math.round(dx/3) > dragThreshold) and that is affecting the outcome of this test. So we need to stay under that threshold. The original point of this test is from f52227f66a7af5692140ad036c06857cd2e7abcf / QTBUG-30188 : when you drag past the dragThreshold, and the dragged Item "breaks loose" and starts dragging, the initial distance that it jumps should be equal to the dragThreshold, not greater. To test it, we need to move a distance which is greater than the dragThreshold in one move event, not break it up into smaller movements. This reverts commit 432eb3344b0581ea1915840365b71376388a75b2. Task-number: QTBUG-58025 Change-Id: Ib6da69fb465b58fde1bf8ba56c4c3a1cb584f698 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* / build a vector of child-filtering parents before delivery of pointer eventShawn Rutledge2017-01-271-0/+10
|/ | | | | | | | | | | | | | | | | | | | | Formerly during normal mouse or touch event delivery, sending it to the Item needed to be done via QQuickWindow::sendEvent, which would then call sendFilteredMouseEvent, which is a recursive function to visit all the item's parents, check whether filtersChildMouseEvents() returns true, if so then return early if childMouseEventFilter() returns true. This is the mechanism by which Flickable (for example) can monitor the movements of an eventpoint even while one of its children has an exclusive grab, and can steal the grab away. Now, we do this by building a vector of such parents first, then visiting them in order. It might be more efficient, it eliminates the recursion, and should eliminate the need for a QSet to ensure that we don't visit the same parent more than once. We can't change the behavior of QQuickWindow::sendEvent() because it's public API, but now we don't use it as much internally. Change-Id: I686fc5612c66eac09ec05c381a648ec65dec3923 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Blacklist qmltest::mouserelease::test_mouseDrag() on RHEL 7.2Liang Qi2017-01-241-0/+2
| | | | | | Task-number: QTBUG-58025 Change-Id: I0768ea834d5666f2831f24c3b2c71b7a4260d5d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmltest: added layout/tst_layout.qml and related filesLiang Qi2017-01-203-0/+186
| | | | | | | | They are moved from qtquickcontrols:tests/auto/controls in 3437fd56. Task-number: QTBUG-58294 Change-Id: I281d4e505b2f699154dd4efb7a4601bdf3856295 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Improve visibility into Positioner positioning from QMLMichael Brasser2017-01-131-0/+75
| | | | | | | | | | Add a forceLayout function, similar to the views, as well as a signal that indicates when positioning has completed. Change-Id: Ice01ea0840c707e403fdd4ea59d92a89e2ed8e4b Task-number: QTBUG-44762 Task-number: QTBUG-32114 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* TestCase: make parent argument to createTemporaryObject optionalMitch Curtis2016-12-211-0/+36
| | | | | | | | This matches the behavior seen from Component's createObject() function. Change-Id: I83fe73a588d04c5efd30c49059bb19e7584bef48 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* TestCase: don't try to access destroyed temporary objectsMitch Curtis2016-12-211-0/+30
| | | | | | | | | | | | | | | | | | Objects created with createTemporaryObject() and createTemporaryQmlObject() can be destroyed manually before the test ends. Before this patch, there would be a type error when trying to check if the object still exists in qtest_destroyTemporaryObjects(). The error seems to stem from the fact that objects that are stored in an array and later destroy()'d are not nullified, but rather left in a corrupt state. See the linked bug for more information about this. We work around this issue by checking for the existence of the destroy() function on the object before attempting to call it. Task-number: QTBUG-57749 Change-Id: I0f6ddd47d86af6fb87392c2992f9f6143af6aab8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* TestCase: add createTemporaryObject(), createTemporaryQmlObject()Mitch Curtis2016-12-141-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A typical pattern with QML tests is to dynamically create an item and then destroy it at the end of the test function: TestCase { id: testCase name: "MyTest" when: windowShown function test_click() { var item = Qt.createQmlObject("import QtQuick 2.0; Item {}", testCase); verify(item); // Test item... item.destroy(); } } The problem with this pattern is that any failures in the test function will cause the call to item.destroy() to be skipped, leaving the item hanging around in the scene until the test case has finished. This can result in interference with future tests; for example, by blocking input events or producing unrelated debug output that makes it difficult to follow the code's execution. By calling e.g. createTemporaryQmlObject() instead, the object is guaranteed to be destroyed at the end of the test function: TestCase { id: testCase name: "MyTest" when: windowShown function test_click() { var item = createTemporaryObject("import QtQuick 2.0; Item {}", testCase); verify(item); // Test item... // Don't need to worry about destroying "item" here. } } [ChangeLog][TestCase] Added createTemporaryObject() and createTemporaryQmlObject() functions that can be used to ensure that dynamically created objects are destroyed at the end of each test function. Change-Id: I483342052462aa86464c86bf2082892712dceb58 Task-number: QTBUG-56361 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Add touch event support to qmltestJeremy Katz2016-12-061-0/+182
| | | | | | | | | [ChangeLog][QuickTest] Add support for simulating touch events from TestCase. Task-number: QTBUG-23083 Change-Id: Ic045e00a91b8270b6f08d398323e06b576615e79 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* allow quick test events to directly target a WindowJeremy Katz2016-08-221-0/+16
| | | | | | | | | | | | QuickTestEvent::eventWindow() is used to determine the window a QObject-based item cast to a QQuickItem is associated with. The window is then used to dispatch simulated events and calculate item positions. This change allows a quick Window or other QWindow-based object to be used directly. Change-Id: I85866ca4c79d5b6a48bac554608cad348aeb6e98 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-0/+4
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qqmltypecompiler.cpp src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4ssa_p.h src/qml/qml/qqmlobjectcreator.cpp Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4ssa_p.h tests/benchmarks/qml/qqmlimage/qqmlimage.pro tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp Change-Id: Iad11ce7fdf0c6d200fdebc16a94081bd8069a87a
| | * Flickable: avoid infinite velocity during release after dragShawn Rutledge2016-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It sometimes happens on touchscreens that mouse events occur too close together. We cannot calculate velocity based on zero elapsed time, so just ignore the event. Task-number: QTBUG-45527 Change-Id: I120e73cfa60e2fcc594cb1f3b69f530e746abddd Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | Add tryVerify()Mitch Curtis2016-07-201-0/+72
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for conditions which can't be tested using tryCompare. One such situation is that of the currentItem property of ListView. In Qt Quick Controls 2, the currentItem property of the ListView that is internally a child of Tumbler can be null for a certain period of time, so using tryCompare() would result in errors due to trying to access a property of a null object: tryCompare(tumblerView.currentItem, "text", "2") The current workaround is to use wait(50) in a for loop, which is ugly and could lead to flaky tests: for (var delay = 1000; delay >= 0; delay -= 50) { if (tumblerView.currentItem) break; wait(50); } verify(tumblerView.currentItem); compare(tumblerView.currentItem.text, data.currentIndex.toString()); Using tryVerify(), we can first ensure that currentItem isn't null, and then use a regular synchronous compare afterwards: tryVerify(function(){ return tumblerView.currentItem; }); compare(tumbler.currentItem.text, data.currentIndex.toString()); [ChangeLog][QtTest][TestCase] Added tryVerify() function to allow verification of asynchronous conditions that can't be tested using tryCompare(). Change-Id: Ie93052b650f7fe0bf26853054a8f0f35a483e387 Task-number: QTBUG-19708 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-293-5/+148
|\| | | | | | | Change-Id: I70c0c672708522f7157849365cc53ee271d8e460
| * qmltest - fix accidentally broken BLACKLISTTimur Pocheptsov2016-06-221-1/+0
| | | | | | | | | | | | | | | | | | Remove the line that previously was a part of 'linecount' test BLACKLISTed and now accidentally BLACKLISTed another test instead. Change-Id: I3618fc0478d7a245c1c5aaaf6f38eb9359f523b0 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * qmltest - remove 'linecount' from BLACKLISTTimur Pocheptsov2016-06-211-2/+0
| | | | | | | | | | | | | | | | Must be fixed on OS X now. Task-number: QTBUG-53778 Change-Id: If94085210115534cf7a467100ec00fc419474c67 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * qmltest::item-grabber - fix image pathsTimur Pocheptsov2016-06-211-0/+152
| | | | | | | | | | | | | | | | | | When running qmltest::itemgrabber we save grabbed image into the qmltest dir but using this name later as 'source' (relative) url we fail to load image. Task-number: QTBUG-53782 Change-Id: Ibd1f32d8bc13ff155b23491401075638cef16987 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * qmltest:doublevalidator - fix localeTimur Pocheptsov2016-06-212-2/+1
| | | | | | | | | | | | | | | | The string "1.0" can fail validation due to locale (requiring ',' for example). Task-number: QTBUG-53779 Change-Id: I44b2b6886d96a7a32668bea56b5f34bb8d9db8d3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-202-1/+4
|\| | | | | | | | | | | | | | | Conflicts: src/qml/jit/qv4targetplatform_p.h src/quick/accessible/qaccessiblequickitem_p.h Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
| * qmltest::linecount - adjust text widthTimur Pocheptsov2016-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | With text line width 50 'Hello world!' is split into 2 lines on OS X 10.11 and the test expectes 3 lines, let's try something less than 50 (44). Task-number: QTBUG-53778 Change-Id: Id3254e9d89e7b41498ff8735eff97f0317ae9677 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Blacklist qmltest::ListView::test_listInteractiveCurrentIndexEnforce()Liang Qi2016-06-101-0/+2
| | | | | | | | | | | | Task-number: QTBUG-54028 Change-Id: I03390ebfb99927851926c0099fb79581f7b9e7a3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1027-1820/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of 0e053528 was reverted in the merge, about lastTimestamp. It will be applied later in separate commit. qmltest::shadersource-dynamic-sourceobject::test_endresult() was blacklisted on linux. Conflicts: .qmake.conf tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp tests/auto/qmltest/BLACKLIST tests/auto/qmltest/qmltest.pro Task-number: QTBUG-53590 Task-number: QTBUG-53971 Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 18:58:02 +0000