aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Let unit tests pass if xmlpatterns is not aroundSune Vuorela2015-07-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blacklist for xmlpatterns tests is not applied unless xmlpatterns specifically has been disabled, but code builds anyways. Fix up the blacklist. Change-Id: I013701e787e8ec28f1282a911270dd7a158d6f01 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Doc: replace Mac OS X with OS XNico Vertriest2015-07-152-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: If21b4551eb95af3370cc21edd7a6721fc06e1346 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | QSGSimpleTextureNode: Fix ownership of QSGTextureTobias Koenig2015-07-031-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the QSGSimpleTextureNode deletes the old QSGTexture if a new one is set via setTexture() and the ownsTexture flag is true. [ChangeLog][QtQuick][SceneGraph] QSGSimpleTextureNode will now delete the currently set QSGTexture object, if a new QSGTexture is set and the ownsTexture flag is on. Change-Id: Iabfbccd390e16948d4575baf29e6c8b4a184a404 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Improve support for HTML entities in StyledTextKai Uwe Broulik2015-07-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the non-breaking space character (&nbsp;) and properly handling entities that do not end with a semicolon, such as a stray ampersand in a text. Change-Id: I2f157c9aa651b27511809d5a47ac07660949a290 Task-number: QTBUG-44869 Task-number: QTBUG-31816 Task-number: QTBUG-33368 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | Add some diagnostics to pixmap cache testUlf Hermann2015-07-311-2/+9
| | | | | | | | | | | | | | | | | | | | | This test is failing frequently and it's unclear why. Change-Id: Ib06582d9d515b3cd571f643077b7e8382f6a98a4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).Friedemann Kleint2015-07-2737-509/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Tests: Replace Q[TRY]_VERIFY(v == true|false) by QVERIFY(v)|QVERIFY(!v).Friedemann Kleint2015-07-2714-180/+180
| | | | | | | | | | | | | | | | | | | | | | | | Preparing the replacement of Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) for non-boolean types. Change-Id: I8a4e44a2b4e20a9c8b811799e3932c8ce1a2cbbb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Emit movement signals for flick().Michael Brasser2015-07-222-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make flick() more like a real flick and ensure the movement signals and properties are updated. This allows them to be handled from QML. This also fixes issues with flick() and dynamic delegates. Flickable has several checks of the form: !d->pressed && !d->hData.moving && !d->vData.moving That were processed incorrectly for flick(), as the moving variables were not being updated. [ChangeLog][QtQuick][Flickable] The movement related signals and properties are now updated for flicks started via the flick function. Change-Id: I7e96e2e12a4d0a0ee73ddd6f29d95f19c44667b0 Task-number: QTBUG-34507 Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Don't change the currentItem after a viewport resizeAlberto Mardegan2015-07-202-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When highlightRangeMode is set to StrictlyEnforceRange and the view gets resized, we don't want the currentIndex to change. The code touched by this patch was introduced by commit I08b7e61496a79f71c3b40fafaca985ae90f88503 back in Qt 4.7 times, and never changed since then. Task-number: QTBUG-43555 Change-Id: Ie67faa6898f13a1f7b0f1c4ae6c29721cb7dfa41 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Adding tests for DesignerSupportThomas Hartmann2015-07-174-0/+564
| | | | | | | | | | | | | | | Change-Id: I577d0e34ce91a1fa11e3e6757bffc7adaec0f1fb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | | tst_qquickmultipointtoucharea: Do not rely on qCompare(bool, int,...).Friedemann Kleint2015-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The overload was added for NokiaX86 and RVCT and is bound for removal. Task-number: QTBUG-47260 Change-Id: I4ead3b03c979a3116278d364ef85fe7d83c5f971 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix potential use of incorrect bounds in delegate tracking.Michael Brasser2015-07-122-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using GridView.SnapToRow and GridView.ApplyRange with a top margin could lead to the view jumping (rather than smoothly transitioning) when changing the currentIndex. Change-Id: I6936b378220f59e8d416f7531cf8b6906c723cb2 Task-number: QTBUG-45640 Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Prevent errors when removing items from Repeater that reference parent.Michael Brasser2015-06-302-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same ordering as item views and release before unparenting. Change-Id: I0346342cfcaf9385d8385769795dd5ba35fc43aa Task-number: QTBUG-46828 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-304-0/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/qml/qqmlengine.cpp src/quick/items/qquickitemsmodule.cpp tools/qml/main.cpp Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
| * | Correctly initialize ListView section attached properties.Martin Jones2015-06-252-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During item insertion, indexes of items in the visibleItems list were not adjusted before new items were created. Section initialization was broken during insertion because section calculation relies on the indexes of the items in the visibleItems list. The incorrect section properties caused spurious section header creation, and layout issues. Apply the index offset before creating the new items. This mirrors what GridView already does. Change-Id: I549a81825cf0e979bc5830840bf6cb75c7a82cac Task-number: QTBUG-43873 Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
| * | QSGDefaultRectangleNode: Fix gradient position calculationsSanttu Lakkala2015-06-172-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the gradient position calculations to consider full border, not just half of it, because the border is fully drawn inside the rectangle, not half outside, half inside. Task-number: QTBUG-36059 Change-Id: Ie7dec94d9f6e03ae07c612c6e3b1950781973dc7 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Fix disabling of text input and pixmap cache tests on QT_NO_LIBRARYUlf Hermann2015-06-263-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | This way it works with the supported -no-feature-library flag to configure, rather than the unsupportd -D QT_NO_LIBRARY. Also, the the parts of the tests that can be executed stay active now. Change-Id: I082b1c84f148a10eaaf4443c931c395bdd1dc4c3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Clear stringCache explicitly instead of asserting its emptiness.Dmitry Volosnykh2015-06-252-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | This assumption does not hold when PathView's path.pathElements list is updated with new contents at runtime. Task-number: QTBUG-46255 Change-Id: I6b0d7ee8ee2d67ca0138eacdf0ad221338f788e4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | ListView/GridView contentHeight should include delayRemove-d itemsMatt Vogt2015-06-234-0/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one or more items are in delayRemove state, the ListView's contentHeight property should include their height. This previously failed if the delayRemove items were at the end of the visibleItems list. Also applies to GridView. Change-Id: Id839e850367a3503123e8ac81dac6ebdccef1a1f Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Disable pixmap cache and text input tests if QT_NO_LIBRARYUlf Hermann2015-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | They depend on loading plugins. Change-Id: Iee2ec4306a9ee2eae6447ee28552c010e4d31b8c Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Add QQuickWindow::TextureIsOpaque as option to createTextureFromImage.Gunnar Sletta2015-06-151-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opaque textures can be a lot faster, so give this option without forcing the user to reimplement her/his own QSGTexture class. The old behavior was that createTextureFromImage() disregarded TextureHasAlphaChannel and looked solely at the image's format. To keep this behavior intact, we introduce a second opt-in flag to switch textures from auto-detect to false, namely TextureIsOpaque. [ChangeLog][QtQuick][QQuickWindow] Add TextureIsOpaque option to createTextureFromImage() Change-Id: I248db4bc5f7920864b6aa8d831ce24d23ad370ef Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Fix up tst_qquickbehaviors.Friedemann Kleint2015-06-101-122/+70
| | | | | | | | | | | | | | | | | | | | | | | | - Use QVERIFY2() instead of QVERIFY() in flaky currentValue(). - Use QScopedPointer consistently, remove delete statements. Change-Id: I8b70d206d26219dba31b0d07216bcb18ff665632 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Make bindings refcountedLars Knoll2015-06-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refcounting our bindings greatly simplifies our memory management of the objects and ensures we safely clean them all up. In addition, it allows us to remove the m_mePtr and weak reference handling from QQmlAbstractBinding as we can safely handle this through the same mechanism. Change-Id: If23ebc8be276096146952b0008b62018f5d57faf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | ObjectModel: add API for dynamic changesJ-P Nurmi2015-06-104-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the ListModel API: - object get(index) - append(object) - insert(int index, object) - move(int from, int to, int n) - remove(int index, int n) [ChangeLog][QtQml][ObjectModel] Added get(), append(), insert(), move() and remove() methods. Change-Id: I592e55b7c4c933a1100191bf5a9405944b347172 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | | Remove QSGSharedDistanceFieldGlyphCache.Robin Burchell2015-06-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | No known users of this interface exist, and not having it helps to make things less complicated. Change-Id: I3d749cfbde9e84e1c7b8dc5cbd952c5c51d347ee Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Mark tests as unstable/flakeySimon Hausmann2015-06-082-0/+4
| | | | | | | | | | | | | | | | | | | | | It failed for example in http://testresults.qt.io/logs/qt/qtdeclarative/baa4a85dbdc4de7d2b4b02b829729dfb46e51305/windows8x86_64windows8x86_64msvc2012developer-build_release_qtnamespace/5aeb8542aafa40f84e974d7ee6346df2b97d1725/testlog.txt.gz while trying to integrate a 100% unrelated doc change. Change-Id: I6b0b8e76d6cdc72e1343ac42a8277b22e3759c50 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTextLayout::additionalFormats setters and getters using QList<FormatRange> have been deprecated; port to the QVector versions. Change-Id: I6702430c09b30aa033fe4e34f39a9aa3350e471b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | Blacklist unstable testSimon Hausmann2015-06-051-0/+2
| | | | | | | | | | | | | | | Change-Id: I1631d38f8c94e8d663df057f2c417c7ef2045949 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Blacklist unstable tests for nowSimon Hausmann2015-06-054-0/+10
| | | | | | | | | | | | | | | Change-Id: Ia29b103c33afd9aafe9ee36ee4447fab17fe00c7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Make QQuickGridView test independent of mouse speedUlf Hermann2015-06-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | In order to prevent it from accidentally hitting the end of the grid prematurely we insert another mouse click. Change-Id: I3f1ecc65af4b60aebf383192cde9a3a6fdeb5c8a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Decouple flickable stopAtBounds test from mouse event timingUlf Hermann2015-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't really want to know if the flickable is still flicking at the end of the flick() call, but rather if it has been flicking at some point. Change-Id: Ib6c89023042b2a45e66f1825a699bb47dc6e13ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix flickable autotestUlf Hermann2015-06-053-48/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make sure we always wait for window activation, not only exposal. * When clicking or releasing, first move the mouse to the right place. * In returnToBounds() show() the window before we rely on its event loop. * In rebound() reduce the delays as mouse events get delivered earlier now and the movement might stop and restart if we wait for too long between subsequent mouse moves. Most of these problems have been exposed by commit 66050f2ac875d451bec31e0d8ff507795b5b18d6 in qtbase. Change-Id: I5a3bc1e4ba92362d69180c8fde33eca47b4b9375 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Move the mouse to the right place before simulating a clickUlf Hermann2015-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the mouse event can be split in two and only a mouse move will be immediately delivered. This problem was exposed by commit 66050f2ac875d451bec31e0d8ff507795b5b18d6 in qtbase. Change-Id: I9d458bd446c754f566d1de412eb90a43f0686ab9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Wait for window activation, not for exposal in key press testUlf Hermann2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version only worked when simulated input events were queued and thus incidentally delivered after the window activation that follows the exposal. 66050f2ac875d451bec31e0d8ff507795b5b18d6 in qtbase made event delivery synchronous for simulated input events. Change-Id: Ieea3d1360b32f3466059a2ffe570d6dc633f81dc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Allow for some delay on starting transitions in flickable testUlf Hermann2015-06-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I218ea874def6060e147cb05eafeb857a9e66eb44 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-046-48/+282
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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>
* | | 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>
* | | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-04-2818-160/+192
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-04-2818-160/+192
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicktext/tst_qquicktext.cpp Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
| | * | Merge remote-tracking branch 'origin/5.4' into 5.5Simon Hausmann2015-04-2718-160/+192
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2518-160/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace hard-coded server ports with dynamically allocated ports. Change-Id: Iab8f9a88343a9f2c49af3cd700c954c13c3bf121 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 12:53:16 +0000