aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QML: Pass the kind of geometry change aroundErik Verbruggen2016-07-111-1/+5
| | | | | | | | | | | | | This prevents re-calculation of what actually changed, and removes the now unused parameter newGeometry. Other than this change calculation, the only place where oldGeometry was used is QQuickListViewPrivate::itemGeometryChanged. To get rid of oldGeometry too, QQuickListViewPrivate now stores the current (i.e. last known) geometry, and updates it in itemGeometryChanged. Change-Id: I8a5286d08a04132c9a4c81de7ce221f5676946e6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Add explanation to tst_QQuickMouseArea::moveAndReleaseWithoutPressFrederik Gladhorn2016-07-081-2/+8
| | | | | | | | | | | | The test makes sure that no events are delivered after the initial press is released. In this context QTRY_* makes little sense, since we are confirming that the defaults have not changed. Thus rather spin the event loop 11 times and hope that if we would accidentally deliver events that we shouldn't, it will be caught in that time. Change-Id: Iadeed07a81978aa6679e5513c1fe0aebcaeeb997 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Prefer public API in testFrederik Gladhorn2016-07-081-7/+7
| | | | | Change-Id: Ib161ffaaea57bdf74e02d0f56c3e02d484a26fcc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* MouseArea: add autotest for subtreeHoverEnabledShawn Rutledge2016-07-072-0/+43
| | | | | | | | Verify the fix in f7e462b. Task-number: QTBUG-54019 Change-Id: Ia9846f9b79473ea4f72e895320cf01d5d85cc1a3 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Added two unit tests for alias nestingSimon Hausmann2016-07-073-0/+61
| | | | | | | | | | | | | | | The first test covers a use-case currently only otherwise see in QtQuickControls, and so having it here allows for catching regressions in that area before hitting the next qt5 build. Having an alias refer to another alias property within the same file only works if the second alias is resolved/processed before the first one. This works by chance when relying on the order of processing reverse to the declaration, but that's a bug. It should work regardless of the order. That is what the second test-case demonstrates and that is why it is marked as failure. Change-Id: Iba386437d21efa868d9814221092df5f7ef6f1f6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QmlProfiler: Extend test to check for timestamp orderingUlf Hermann2016-07-061-1/+22
| | | | | | | Timestamps should always increase monotonically. Change-Id: Idfd44e160193aab7bce37b58bc42a94ff087d15e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix tests in tst_QQuickMouseArea for big startDragDistanceFrederik Gladhorn2016-07-061-41/+60
| | | | | Change-Id: I8610887e7d1d3b0c6bd9ab60e55ce1e9209bcae7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix tst_QQuickMouseArea::preventStealing for big startDragDistanceFrederik Gladhorn2016-07-051-17/+29
| | | | | Change-Id: I38c3a663409633bd7020c2630bf11c2e46082435 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix tst_QQuickMouseArea::setDragOnPressed for big startDragDistanceFrederik Gladhorn2016-07-051-11/+10
| | | | | Change-Id: I9f2795bcaaec2b126a41c6a6a12a2d5e55d0beee Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix tst_QQuickMouseArea::cancelDragging for big startDragDistanceFrederik Gladhorn2016-07-051-4/+10
| | | | | Change-Id: Ia39947f7b6f42c48738af81966deb9c98f708da5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix tst_QQuickMouseArea::dragging for big startDragDistanceFrederik Gladhorn2016-07-051-7/+22
| | | | | | | | On macOS the mouse move events go through qcursor's setPos. That in turn uses a native event, so the waits are there for a good reason. Change-Id: Icb616d303c5280f2a9ba5f78cf07032c298b84a7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QtQuick: clean up shader effect property connectionsErik Verbruggen2016-07-051-26/+31
| | | | | | | | | | | | | | | - Don't use a signal mapper, but handle the mapping using a custom slot object and a lambda to do the dispatching ourselves. - Don't do meta-calls by property name, but by index. - Cache the meta-object. - Resolve the property indices by using the QML property cache. For a shader with 6 property connections, the time spent goes from 320k instructions to 80k instructions (valgrind on x86_64). Task-number: QTBUG-53901 Change-Id: I2809198cf62f9716b3683798222203fc3e97fbb3 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Improve tst_QQuickMouseArea::pressedCanceledOnWindowDeactivateFrederik Gladhorn2016-07-051-8/+6
| | | | | | | | | | | | | | | Make it more reliable and faster - average run time goes down by ~400 ms while the test passes reliable for me after this change. Most QTRY_* will return instantly since the condition will be good in any case. On my laptop the test tended to fail roughly every 4th run without this patch. The failure was the second click on the new window not working without the QTRY_VERIFY. Removing the extra 200 ms wait time is what makes it faster - I see no good reason for the wait here. Change-Id: I5f45da91ef04a9b807ff0e9362c9d9b3881c227d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix tst_qquickpincharea::pan with highdpi and document itFrederik Gladhorn2016-07-042-13/+54
| | | | | | | | | | | | The test was expanded slightly and documented, so that it's easier to understand the strangeness of the center. On my display the dragThreshold is returned as 16 while the test assued it's always <= 10. Explain the math and the coordinate changes due to everything being in item coordinates. Change-Id: I4bf72271895ecd9e248154c08bf36eab376c6d79 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Canvas test: make sure canvas is readyFrederik Gladhorn2016-07-043-1/+5
| | | | | | | | | | | | before: Totals: 80 passed, 653 failed, 0 skipped, 0 blacklisted, 35852ms after: Totals: 729 passed, 4 failed, 0 skipped, 0 blacklisted, 29599ms The last four failures are due to high dpi issues. Change-Id: Ie937091558395572dc281ee5a5b90848ea9d2081 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Stabilize tst_SceneGraph::createTextureFromImageFrederik Gladhorn2016-07-041-0/+1
| | | | | | | | | | | The test would crash half the time on my laptop due to the scene graph not being initialized and then returning a nullptr for the texture. At that point texture->hasAlphaChannel() crashes. Change-Id: I9220d9bd6abe6381752c26335f2b60fa8d2adccf Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix tst_rendernode to work with hidpiFrederik Gladhorn2016-07-041-7/+9
| | | | | Change-Id: Id2a7f20933533f69fa43eefc2338205b82a27ccd Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-3011-7/+214
|\ | | | | | | | | | | | | | | | | Conflicts: src/quick/items/context2d/qquickcanvasitem.cpp src/quickwidgets/qquickwidget.cpp tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2910-7/+201
| |\ | | | | | | | | | Change-Id: I70c0c672708522f7157849365cc53ee271d8e460
| | * ungrab touch points if the MultiPointTouchArea is hidden or disabledJan Arve Saether2016-06-232-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused MPTA to not emit onCanceled and caused the touch points 'pressed' property to not become 'false' after the MPTA was hidden or disabled. We now ungrab the touch points where we already ungrabbed the mouse. Change-Id: I90a5d4fa4b3fa470b8b60881c80418e79061f001 Task-number: QTBUG-42928 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * 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>
| | * QQuickSpriteEngine: avoid entering infinite loop in assembledImage()Daniel d'Andrada2016-06-214-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow a frame size larger than the image size, otherwise we would never leave "while (framesLeft > 0) {...}" as framesLeft is never decremented because "copied/frameWidth" in the expression "framesLeft -= copied/frameWidth;" always resolves to zero because copied < frameWidth. Task-number: QTBUG-53937 Change-Id: Ia777ec65d72562426b13533918efcaca5bcabdd7 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | * Report changes correctly when inserting into a ListViewStephen Kelly2016-06-211-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v5.6.0-beta1~7 (ListView: Sanitize visibleItems list after model insertions, 2015-12-07) introduced sanitizing of the container of visibleItems, but it did not affect the return value of the QQuickListViewPrivate::applyInsertionChange function. The return value is used in QQuickItemViewPrivate::layout() to determine whether the layouting should proceed, or an early return is possible instead. If the layouting does not proceed, then the newly inserted visible items do not get painted, resulting in the linked bug. The return value of the QQuickListViewPrivate::applyInsertionChange function was previously determined by whether the new count of visible items is greater than the previous count. After the sanitation in commit v5.6.0-beta1~7, this numeric comparison is no longer a good indicator of whether a repaint is needed. Change the return value to indicate whether new items were inserted which are visible in a more-direct way. Verify that visible items are initialized correctly in tests. They should not be 'culled'. It is necessary to invoke the layout method first to clear the forceLayout state. Two pre-existing tests fail before the fix in this patch. Change-Id: I625f1e02bf7001834adb147161a1e478a0ce2a0d Task-number: QTBUG-53263 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * 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-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Lazy create QmlEngine on accessing rootContextAllan Sandfeld Jensen2016-06-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | A common usecase appears to be to set variables in the rootContext before loading a url in a QQuickWidget. We there need to ensure there is a QmlEngine to set variables on when this is attempted. Change-Id: I07aff2104313eeb3fab902ea3c6043c3c82c50f7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Create QmlEngine lazy in case one is not neededAllan Sandfeld Jensen2016-06-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickWidget may be used with just a root item, and won't need a QmlEngine in that case. So if one isn't given to the constructor, only create one when one is needed for evaluating source. Change-Id: I96cfe5e2473d5d53fc2d52d4646d36c43f4ccb8a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Handle AA_ShareOpenGLContexts consistently in QQuickWidgetLaszlo Agocs2016-06-291-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget has offered a lot more fine-grained control over the lifetime of the OpenGL context it uses for rendering. In practice QQuickWidget also requires at least a part of this. To unify the behavior when it comes to reparenting to a different top-level window, add the bail out condition for AA_ShareOpenGLContexts to QQuickWidget as well. [ChangeLog][QtQuick][Important Behavior Changes] QQuickWidget now behaves identically to QOpenGLWidget when it comes to handling window changes when reparenting the widget into a hierarchy belonging to another top-level widget. Previously the OpenGL context always got destroyed and recreated in order to ensure texture resource sharing with the new top-level widget. From now on this is only true when when AA_ShareOpenGLContexts it not set. Task-number: QTBUG-54133 Change-Id: Ifda0db76fdf71dae1b9606fb5d59cee6edc2f5a4 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Minor optimizationSimon Hausmann2016-06-274-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've seen people write property SomeItem myProperty: null This is an unnecessary initialization that ends up creating a binding expression. Generally there's handling missing for null and undefined, but in this very case we should just optimize away the initializer expression, because QObject style properties are initialized to null by default, as opposed to undefined. Change-Id: I7af4cd45461304753c93cef3926f6e92d3b6c95d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | QML: Specialize bindings based on target property type.Erik Verbruggen2016-06-272-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we can determine the type of a target property during type compilation, we can skip a whole bunch of code that deals with converting the result of a binding to the correct (target) type. This removes 65 instructions on x86 for such typed bindings. Change-Id: Id2c7c57b9ae6dfbeb921121beae9630604ca1d17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add cross-backend simple rect, texture, and ninepatch nodesLaszlo Agocs2016-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGSimpleRectNode is deprecated -> use QSGRectangleNode via QQuickWindow::createRectangleNode() instead. QSGSimpleTextureNode is deprecated -> use QSGImageNode via QQuickWindow::createImageNode() instead. The OpenGL version of the simple rectangle node is switched over to the vertex color material instead of flat, to allow for better batching. Use the same concept for nine patch nodes. The "style" node from Quick Controls 1 is now QSGNinePatchNode in order to provide a proper cross-backend solution which is already necessary due to the software backend, but now generalize it to apply to the accelerated backends with proper materials as well. QC can now simply call createNinePatchNode() without further ado. Also fixes a bug with the D3D12 texture material not enabling blending when needed. When it comes to the internal class names, QSGRectangleNode and QSGImageNode get the Internal prefix in the adaptation layer in order to differentiate from the public API. This involves quite a lot of renaming, but results in a nice and clean public API. Change-Id: Iddf9f9412377843ea6d652bcf25e68d1d74659ea Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | V4: Pass scope around as parameters inside the runtime.Erik Verbruggen2016-06-221-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of many (or all) runtime functions consist of first creating a QV4::Scope, which saves and restores the JS stack pointer. It also prevents tail-calls because of that restoring behavior. In many cases it suffices to do that at the entry-point of the runtime. The return value of a JS function call is now also stored in the scope. Previously, all return values were stored in a ScopedValue, got loaded on return, and immediately stored in another ScopedValue in the caller. This resulted in a lot of stores, where now there is only one store needed, and no extra ScopedValue for every function. Change-Id: I13d80fc0ce72c5702ef1536d41d12f710c5914fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | D3D12: Support runtime threaded shader compilationLaszlo Agocs2016-06-221-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's revise our policy of offline/bytecode only shaders. ShaderEffect benefits greatly from having runtime compilation support for HLSL source strings, especially when dynamically constructing shader strings. There is no reason not to support both approaches since we rely on d3dcompiler for reflection anyhow. What's more, we can call D3DCompile on a dedicated thread, keeping the gui responsive while compilation is on-going. Change-Id: Ie6c02c2aa0ebd0c8371bbf30b3ce6582128c457b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-215-5/+215
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickflickable_p_p.h src/quick/items/qquickpathview_p_p.h tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp Change-Id: I77664a095d8a203e07a021c9d5953e02b8b99a1e
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-203-2/+5
| |\| | | | | | | | | | | | | | | | | | | | | | 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>
| | * highdpi manual test: include <QDebug> not qDebug.hShawn Rutledge2016-06-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I24b3ccd23fdb42d44978debeeec96bac179edba6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * QML: Only release types if they aren't referenced anymoreUlf Hermann2016-06-101-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 Change-Id: I8567af8e75a078598e4fed31e4717134e1332278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@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.7.0' into 5.7Liang Qi2016-06-162-3/+210
| |\ \ | | | | | | | | | | | | Change-Id: I7b0ad528da17ecdb955c2d0c792c9f113904623e
| | * | 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>
* | | | Clean up pragma singleton handling in the type loaderSimon Hausmann2016-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the m_isSingleton boolean by checking the CompiledData::Unit::flags after the type compilation. This is more compact and makes the singleton type checks independent from the IR. Change-Id: I04189d284e6ea275ac8540918836b641914e7588 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Increase test coverage for the V4 memory managerFrank Meerkoetter2016-06-203-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a small test that exercises a number of code paths inside qv4mm.cpp which are normally gated via environment variables. Change-Id: Ibe959387a9b86ce68df258513446d2165fe06ee2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Clean up file/error handling in the type loaderSimon Hausmann2016-06-203-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fold the functionality of reading QFile contents via QQmlFile into QQmlDataBlob::Data. This reduces the dependency on QQmlFile - which is scheduled for removal - and it makes it possible in the future to avoid reading the file altogether if we have a cached compilation unit on disk. Change-Id: Ieeaf52b6fb1d25665cd3c3b196819e25aba3dd15 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Added basic support for saving compilation units to diskSimon Hausmann2016-06-173-1/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hidden behind a QML_DISK_CACHE=1 environment variable we will now attempt to save a binary representation of the type compilation for Foo.qml next to it called Foo.qmlc. Change-Id: I27e800b50cdb186669256fd277578ea1f1e70513 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devShawn Rutledge2016-06-1436-10/+234
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1336-10/+234
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
| | * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1035-8/+232
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14 10:30:22 +0000