aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QML: Only release types if they aren't referenced anymorev5.7.0Ulf Hermann2016-06-111-3/+12
| | | | | | | | | | | Just checking for references on m_compiledData is not enough. The actual component can also be referenced. Thus it won't be deleted on release(), but cannot be found in the type cache anymore. Task-number: QTBUG-53761 (cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e) Change-Id: If254d5bca1f41ec948ec1438df0d37bf8d531bdf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix QQuickItem change listenersJ-P Nurmi2016-05-241-0/+198
| | | | | | | | | | | All listeners should get invoked, even if they remove themselves while iterating the listeners. An index-based loop would skip the next listener in the list. This change replaces the QPODVector with a QVector, so we can make a cheap copy before iterating the listeners. Change-Id: I2430b3763184a40ad1c5c3a68d36fecafcadb3ee Task-number: QTBUG-53453 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* V4: allow inlining of ExecutionEngine::{qml,js}Engine()Erik Verbruggen2016-05-202-0/+4
| | | | | | | | All other changes are just to be able to include qv8engine_p.h in qv4engine_p.h Change-Id: I71ba2ec42cdc20d5c7d97a74b99b4d1ada1a5ed8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Don't render when width is zero and elide is not NoneKari Hautamäki2016-05-202-0/+40
| | | | | | | | | Works now similarly as with very small text lengths (smaller than elide characted length). Change-Id: I0c4aafbcc50343bb0ec8b5f335045e1048a499fd Task-number: QTBUG-34990 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1917-47/+138
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4engine_p.h Change-Id: I89ffccd699bee675732758d039e22224b275d60d
| * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-198-28/+92
| |\ | | | | | | | | | Change-Id: Ib7f8c60143c1efab279476dba390a3d9837ccc37
| | * Fix crashes when incubating objects asynchronously with initial propertiesSimon Hausmann2016-05-183-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression from commit 94e337fa95425d259e81b4d21f4d0853108553bd where we accidentally ended up not having a calling QML context set anymore when initializing the properties on newly incubated objects as provided by the caller. The QML context is necessary as for example when we set a URL property, the URL can be relative and it will be resolved to the base url of the context when written, such as in in QQmlPropertyPrivate::write. Change-Id: I1d896381fc92f653a7d76f4d82174bca48828f5e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * blacklist the qmlextensionplugins example for testingOswald Buddenhagen2016-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | it requires a special import search path. it would be possible to hack this into the test launcher, but that doesn't seem worth it (there are other plugin examples already). Change-Id: I147b802c690933803cb8f9cf35210618957a6998 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * remove blacklisting of tiger and fonts examplesOswald Buddenhagen2016-05-131-2/+0
| | | | | | | | | | | | | | | | | | | | | the associated bugs are marked as fixed for a long time. Change-Id: If8c8710bdf4b7b1962c9749b701cbd335d938fdb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * adjust example naming convention test to "new" structureOswald Buddenhagen2016-05-131-5/+4
| | | | | | | | | | | | | | | Change-Id: I42ec26bd3c2ffa32ae8c5323f7c0a0343d12ce2f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * make use of COPIESOswald Buddenhagen2016-05-134-21/+12
| | | | | | | | | | | | | | | Change-Id: I479c9523a89be1d64364e8205daa5860e16882cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Revert "Remove this piece of code"Simon Hausmann2016-05-182-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bad007360a0f6fba304d8f4c99826a1250fd886c. The lookup in the global object is necessary to detect whether we've seen any unresolved properties. This is used for the optimization of skipping binding refresh updates when a context property changes. Task-number: QTBUG-53431 Change-Id: Idb39a32e4b58b915496bbb9d8a098dc17a6f688a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | standardize on QT_CONFIG debug_and_release instead of build_allOswald Buddenhagen2016-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | the two flags are equivalent. use the same one everywhere. Change-Id: I9ac0caad5a9a8d37813f8de4d81067e20656abc5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | QQuickTextInput: Remove redundant centerPoint calculations.Robin Burchell2016-05-171-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | The default is to press/release in the center of the window, so we don't need to DIY. Change-Id: Id65b2b54c15d45e8d780a008d05275718f519a71 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | prune unused assignmentOswald Buddenhagen2016-05-121-1/+0
| |/ | | | | | | | | Change-Id: Iecb1e9cd4d068660a96ba98480e92d9aa3981671 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * QML: add librarymetrics_performance to the builds.Erik Verbruggen2016-05-103-1/+4
| | | | | | | | | | | | | | | | Also make sure that we can easily deploy this test to devices by putting all data inside a qrc file. Change-Id: I175830fde51332b13068b163eba3d68c0535b712 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Make it possible to call some benchmark functions directlySimon Hausmann2016-05-091-0/+6
| | | | | | | | | | | | | | | | | | | | Some benchmarks - such as "elements" - rely on QQmlMetaType::qmlTypeNames(), which is implicitly populated when other benchmarks import for example QtQuick. However when calling them directly, the benchmark data set is much smaller. Therefore let's add QtQuick to the "base" set that is always available. Change-Id: I4b3696a426854195deb1c31ad24d80427da7b340 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Fix tst_qquicktext::hAlignImplicitWidth() on high DPI displaysMitch Curtis2016-05-121-2/+4
| | | | | | | | | | | | | | | | | | The test assumed that the grabbed image of the window was the same size as what was specified in QML, but QQuickWindow::grabWindow() returns an image that is scaled by the screen's devicePixelRatio. Change-Id: I5b361edb28bec562c7f528d06892277dcbe5769f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QML: Fill QtObject lazily.Erik Verbruggen2016-05-112-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only iterate over the enumerations/enumerators in the staticQtMetaObject when a get() is done, and the key/value is not yet in stored in the underlying Object. The whole cost of the iteration is now moved to get() and advanceIterator(). The latter will add all items in one swoop, but iteration over QtObject isn't used much (if at all). The get() will add all key/value pairs up until it finds the requested key. Checking a number of applications shows that none of them use all (or the "last") key, so it will actually save entries (which equals memory) too. This change reduces the instruction count for QtObject from 2.7M instructions down to 95k. As this initialization is done from the QQmlEngine constructor, it also speeds up that initialization. Task-number: QTBUG-43770 Change-Id: I71331ff76bdacdd4790f7ff0430c4cbc214fe0ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | QML: Remove internal field padding from QQuickAnchorPrivate.Erik Verbruggen2016-05-103-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't store QQuickAnchorLine, but store both fields separately in QQuickAnchorPrivate. This prevents padding of QQuickAnchorLine, saving 48 bytes on x86_64 (or any platform where structs are 8-byte aligned). On x86_64, this also removes ~180 instructions for each QQuickAnchor creation/removal, and speeds up the constructor by 25%. While in the neighborhood, do a drive-by change and merge QQuickAnchorLine::AnchorLine and QQuickAnchors::Anchor by removing the former. Change-Id: I50ab6252b1903f5f1a075174e6185c3048a8f8ec Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-065-2/+94
|\| | | | | | | Change-Id: I3c6a93917cb46868cdb9dd50566b90c70f67102e
| * Revert "Temporarily blacklist importsPath change on Windows"Simon Hausmann2016-05-021-2/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 91a96d1de9c3d3f8d598ee8fbcf2d1868635ec46. I've been told that the race condition in the networking stack has been fixed on Windows. Change-Id: Ica038229e8e164a199332288ed140ca6a1d3104c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * AnimatedImage: Fix value of sourceSize propertyTobias Koenig2016-05-021-0/+23
| | | | | | | | | | | | | | | | | | | | Cache the source size of the internal QMovie object during the change of the 'source' property to ensure that always a valid source size is returned without emitting more sourceSizeChanged() signals than necessary. Change-Id: I637b80efb133197b7345b09fcf8a7bb80c5643c9 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * Fix crash when trying to call a property of the scope or context objectSimon Hausmann2016-05-012-0/+25
| | | | | | | | | | | | | | | | | | | | For calls on properties of the scope or context object the thisObject parameter in the callData is a reference to the QmlContext, not a real object - therefore the toString conversion fails. Task-number: QTBUG-52340 Change-Id: I08d01cc5c05920c2fac46ddd40fa41e630bcade3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * QQuickDragAttached: fix updating of "active" propertyAlberto Mardegan2016-04-261-0/+46
| | | | | | | | | | | | | | | | | | The d->active member variable should be changed regardless of the value of Drag.dragType. Task-number: QTBUG-52540 Change-Id: I7fa39ccf11b1200e9c2f6fe57cba58657b6cff74 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Add QVector support to JS sequencesKevin Ottens2016-05-033-1/+39
| | | | | | | | | | | | Change-Id: I731355aa1754721236f3711a65af4f96781cebc0 Task-number: QTBUG-51467 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Quick: expose movementDirection of PathViewLiang Qi2016-05-022-0/+111
| | | | | | | | | | | | | | | | | | It is needed by the behavior of TabBar in universal style in QtQC2. [ChangeLog][QtQuick][PathView] Added movementDirection property Change-Id: Iedc214a12e7336e52125ec82b9ded45502905978 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-2737-34/+262
|\| | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickimagebase.cpp src/imports/layouts/plugin.cpp Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
| * QML: Access QQuickItemPrivate data (like x/y/etc) directly.Erik Verbruggen2016-04-211-0/+20
| | | | | | | | | | | | | | This saves ~5% in QQuickAnchorsPrivate::itemGeometryChanged on x86_64. Change-Id: Iccf782521e9c8523c41c6f2e6d87fad401762a9e Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * Also match QJSValue conversion types in MatchScore.Michael Bruning2016-04-202-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This had the effect that overloaded methods were always mapped to the wrong slot. [ChangeLog][QtQml][Important Behavior Changes] When matching the method signature of a invokable method to the slot in the metaobject, the matching function now assigns the best match to a QJSValue if the parameter actually is a QJSValue. This corrects the previous behavior, where QJSValue and int were given the same match score even though QJSValue would have been the best match. Task-number: QTBUG-51746 Change-Id: I906e7b006ee5af92ea760ed1625e5047aef123bf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Revert "Fixed MouseArea threshold with preventStealing"Michal Klocek2016-04-201-11/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit e1400b5b4d8311769ad3b9f631479ee2b0271197, which breaks qtlocation unit tests for drag support. It is no longer possible to drag markers in mapviewer. Task-number: QTBUG-52534 Change-Id: If713a8e45f64ea898f38fe3e39561ebc266403b2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Fixed MouseArea threshold with preventStealingFilippo Cucchetto2016-04-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When preventStealing is true both keepMouseGrab() and d->stealMouse are true. This in turn enable the dragging immediately since the condition "keepMouseGrab() && d->stealMouse && !d->drag->active()" is true. Conversely when preventStealing is false the dragging is enabled in the next move event since keepMouseGrab() and d->stealMouse are set true inside the last "if" "!keepMouseGrab() && ...check threshold..". This patch adds a new boolean flag for storing if we detected a drag motion (so we exceeded the threshold) and enable the dragging iff this flag is true. With this change: - if preventStealing is true (and so keepMouseGrab() and d->stealMouse) the additional d->overThresHold prevent the start of dragging. At the same time the last if (!keepMouseGrab()) cannot be executed since keepMouseGrab is true and we still check for the threshold being exceeded. - if preventStealing is false, we still check for exceeding the threshold and if this happen we enter in the last "if" since !keepMousegrab() && d->overThreshold is true taking the mouseGrab as without this patch Task-number: QTBUG-52534 Change-Id: I2b14d3048b6f8223c90ce5e2fd26e7ca706cb56a Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * activate QtQuick designer support testsTim Jenssen2016-04-191-0/+1
| | | | | | | | | | Change-Id: I5540eda05e6e4d7ab01c85b1da32e8677a9c332d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Occasionally trim the type cacheUlf Hermann2016-04-192-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | As loaded components are kept in a cache, they are never removed by the garbage collector. So, if you periodically create new components, they leak. This change adds a floating threshold for the number of components. When that threshold is surpassed trimCache() is called and unneeded components are removed. Task-number: QTBUG-42055 Change-Id: I30e3e4ee287f6d34376713668009c67614a50e0c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * tst_qquickanimatedimage::mirror_notRunning(): fix initializer.Edward Welbourne2016-04-151-5/+1
| | | | | | | | | | | | | | | | | | | | Initializing paused to isPlaying() then checking it subsequently agrees with isPaused() is an obvious copy-and-paste bug in the test, which was meant to check runtime state wasn't changed by a snapshot. Task-number: QTBUG-36717 Change-Id: I7a206b07071b862dbe4c0331af6bc32157a415b2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix memory corruption when calling Array.unshift()Simon Hausmann2016-04-141-0/+15
| | | | | | | | | | | | | | | | | | | | The dequeue offset won't wrap around when n > offset. [ChangeLog][QtQml] Fix crash with Array.unshift() Task-number: QTBUG-52065 Change-Id: I5e8b89ec964cd6397100442a5239254bca989a3f Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * Add another test for broken selectionsEskil Abrahamsen Blomfeldt2016-04-111-0/+22
| | | | | | | | | | | | | | | | This test is for 24914b1acbfc5e45768dd1465b9e3f3e61185829 in qtbase. Task-number: QTBUG-51759 Change-Id: I59081ec5268359f25c492f0536f985793e08e250 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * Instantiate static Qml plugins declaring QQmlExtensionInterface onlySebastian Lösch2016-04-1126-27/+149
| | | | | | | | | | | | | | | | | | | | When instantiating static plugins no check is done whether the QQmlExtensionInterface is declared. Therefore all user plugins are instantiated in the Qml thread, which may cause problems. Task-number: QTBUG-52012 Change-Id: Ia91ec5ec7b2a9721bd11e3648cdc161855b4454e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * QQuickText,QQuickTextInput: Fully qualify enumerations in changed() signals.Friedemann Kleint2016-04-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | Similar to change 85b64e701b2eaecdd30a7e0e079e2c80dd846fec. Fixes test warnings: QWARN : tst_qquicktextinput::mouseSelectionMode_accessors() QSignalSpy: Unable to handle parameter 'mode' of type 'SelectionMode' of method 'mouseSelectionModeChanged', use qRegisterMetaType to register it. QWARN : tst_qquicktext::textFormat() QSignalSpy: Unable to handle parameter 'textFormat' of type 'TextFormat' of method 'textFormatChanged', use qRegisterMetaType to register it. Change-Id: I9105eb31ce3d6203602649e24835f4fb0ddb25fd Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Allow target path version in a parent moduleJ-P Nurmi2016-04-2115-1/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, the QML Engine is now able to locate QtQml.Models 2.x in both of the following target/installation paths: - QT_INSTALL_QML/QtQml/Models.2 - QT_INSTALL_QML/QtQml.2/Models This is required for QtQuick Controls 2. The target path of the module is QT_INSTALL_QML/QtQuick/Controls.2. The built-in styles are installed as sub-directories to be able to locate them from the controls module. Some of the built-in styles provide their own C++ extensions via style- specific imports (eg. the Material attached property is imported from QtQuick.Controls.Material 2.0). The problem is that the QML Engine does not find the module from QT_INSTALL_QML/QtQuick/Controls.2/Material, but requires it to be installed outside the main controls module ie. QT_INSTALL_QML/QtQuick/Controls/Material(.2). This makes it a) hard to locate the styles from the main controls module, and b) conflicts with the target path of QtQuick Controls 1. [ChangeLog][QtQml] Made the QML Engine capable of locating QML sub- modules from within a versioned parent module path. For example, QtQml.Models 2.x can be either in QT_INSTALL_QML/QtQml/Models.2 or in QT_INSTALL_QML/QtQml.2/Models. Change-Id: I2fe4bbdd6d04dd1e80cbe9b3e7e02617658a0756 Task-number: QTBUG-52556 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Fix assertion in qt_create_image_data()Peter Varga2016-04-192-0/+23
| | | | | | | | | | | | | | Fix rounding of width and height parameters. Change-Id: Ib7655dafe382684340c32e2d2dc8adb445af65b0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Fix changing QML Window visibility in Component.onCompletedRobert Griebl2016-04-182-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | Creating a transient QML Window with visible set to false and then trying to show() it in Component.onCompleted led to a race condition where the window would be shown for a brief moment and then hidden again to enforce the delayed initialization of the visible property. Fixed by tracking the value of the visible property regardless of the 'completed' state. The same problem was fixed for the visibility property. Task-number: QTBUG-52573 Change-Id: I2a2ed7f359b951cb9189a7a6628d1d0cc1445d73 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Fix compilation of qmldevtools/compile test.Rafael Roquetto2016-04-131-0/+1
| | | | | | | | | | | | | | | | C++11 was not automatically enabled, causing the build to fail. load(qt_common) addresses the issue. Change-Id: If54c5253942b057677035ed9c8785a2be535c41f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-0883-1567/+67
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0883-1567/+67
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2930-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>
| | * Removed the QQmlGuard benchmarkSimon Hausmann2016-03-243-79/+0
| | | | | | | | | | | | | | | | | | | | | | | | It's not really useful for automated benchmarking and by now most of QQml has been ported to QPointer. Change-Id: I4ee34ad481fde9ae9903ad50cba7afd7b6ff7bc5 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * 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>
| | * Add benchmarks to the "make benchmark" targets that are known to workSimon Hausmann2016-03-1724-27/+30
| | | | | | | | | | | | | | | | | | | | | The qjsengine benchmark is one exception that is omitted because it crashes currently. Change-Id: Ic93344dc864d0d6427d85faa12a2753126be808e Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>