aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* QQuickTextLine: set lineOffset to zero in ctor5.5Anton Kudryavtsev2015-12-171-1/+1
| | | | | Change-Id: Ie6b085157cebaf06750a30bc050b6bed0c7f6018 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* docfix: Make it clearer how Context2D relates to CanvasGunnar Sletta2015-11-301-0/+8
| | | | | Change-Id: Id64aff29ef8bc7cbb4f7fc46b1a0d30a47585055 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* MouseArea: fixed a crash in propagate()Liang Qi2015-11-261-1/+1
| | | | | | | | Should not propagate without window. Task-number: QTBUG-49100 Change-Id: Ieda3a8357283f8d07d4ffc0cc62c4e15645d7e5a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix grammar in TextInput documentationMitch Curtis2015-11-021-1/+1
| | | | | Change-Id: I78ecd97c25da70faf8438dd02d50952d2fb80a22 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: added documentation to undocumented functionsNico Vertriest2015-11-024-1/+43
| | | | | | | Task-number: QTBUG-36985 Change-Id: I219375d405fbfb53611c0138698e955d9cd5d821 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Make it possible to change sources of ShaderEffect again.Gunnar Sletta2015-10-202-30/+34
| | | | | | | | | | | | | | | | | 92433623b31388e2e8c4d532033dad6189eaab24 introduced a bug where an unused material would clear its typeid pointer. This resulted in that a changed shadereffect would in all likelyhood get the same pointer for its changed shader which would result in using the same GL shader inside the renderer. This change rewrites the logic so that the cache is per render thread and the cache is cleaned up along with other GL/SG resources as part of scene graph invalidation. Task-number: QTBUG-48856 Change-Id: Id2feb14f584b5f5c176e8176cc9f1b54abd0d079 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Scene Graph: Fixed memory leak in QSGBatchRenderer::Renderer::map()Martin Banky2015-10-191-2/+2
| | | | | | | | | | | | | | | | | In the uncommon case (m_context->hasBrokenIndexBufferObjects() || m_visualizeMode != VisualizeNothing) of mapping a buffer, malloc is called without first freeing the previous malloc. Regression was introduced with: qt5 commit: 9347499e78f03710eaf24af3c1e7ac650d0ef81d qtdeclarative commit: a371bac3fba73f92aaa63a68d8ab1ae81a1d1031 [ChangeLog][QtQuick][Scene Graph] Fixed memory leak in QSGBatchRenderer::Renderer::map() Task-number: QTBUG-48799 Change-Id: I5ef4b7301d390463845aeb192851f86655962499 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix QQuickTextDocumentWithImageResources image loadingRoman Pasechnik2015-10-152-22/+18
| | | | | | | | | | | QQuickTextDocumentWithImageResources always tries to load images itself and not using QTextDocument internal resources. What it should do: 1) Check if QTextDocument already has image resource and use it. 2) If not, try to load resource manually. Change-Id: Ifc4d919fc4a08b4efae50e06a42f1af7cee67af3 Task-number: QTBUG-32525 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* AnimatedSprite: avoid unnecessary redrawsTim Blechmann2015-10-142-4/+17
| | | | | | | | | AnimatedSprite currently triggers a redraw for every update. however this should only be done, when the next frame will actually be different to the current one. Change-Id: I550bd32c02807e4c3f4847fb2608f5ad0cf0a59a Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* QQuickItem: detect loop in KeyNavigation chainLiang Qi2015-10-141-1/+3
| | | | | | Task-number: QTBUG-47229 Change-Id: I22dbe5ee1fff4e9a8de4fa69b43e4d9a87677192 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Correct some areas of QQuickItem's documentationMitch Curtis2015-10-131-8/+8
| | | | | Change-Id: I2a2c684cd3f55a5a4311fd28b893e6a93c022ace Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fixed 'plataforms' typo in WheelEvent documentationDaniel Levin2015-10-061-1/+1
| | | | | | Change-Id: I08907f6c0d435c2a056f759ba58f616a5b0368d2 Signed-off-by: Daniel Levin <dendy.ua@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Image: fix crash when switching between multiple screensMitch Curtis2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a Qt Quick application containing Image delegates in a view (e.g. ListView, GridView, etc.) between multiple screens, it's possible that the amount of visible delegates changes due to potential differences in the screens' sizes. For example, moving an application using the Window + left/right arrow keys on Windows causes the window to snap to the side of the screen. If one screen is smaller than the other, moving the application back and forth in this manner will cause some delegates to be destroyed, as they are no longer visible in the smaller screen. However, between receiving the Component.destruction signal in QML and being actually destroyed in C++, the Images may try to reload their pixmaps (when the cache property is set to false, for example). Since the views had (correctly) already hidden those delegates and hence they had no associated QQmlEngine, the load() function would crash because of the assumption that there was a valid engine. This patch checks that there is a valid QQmlEngine with which to load pixmaps before doing so. Change-Id: I8a3f0ec5220fddfd79758985c1eb2b55b0baae47 Task-number: QTBUG-45991 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Link to Item Layers documentation from each property of layerMitch Curtis2015-09-231-2/+15
| | | | | | | | The layer properties desperately lack code snippets, but the Item Layers section has some, so link to that. Change-Id: I3172102b5a1f95bfc495242a16141f030db0dd3c Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix ViewTransition property type in documentationMitch Curtis2015-09-221-3/+3
| | | | | | | They were all documented as being lists. Change-Id: I95b843ed75dd922d9a3d8824e666a344688091c9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Fix compilation of QtDeclarative with QT_NO_GESTURESTobias Koenig2015-09-224-1/+9
| | | | | | | | Allow to compile QtDeclarative module with QT_NO_GESTURES define enabled. Change-Id: I5335f97c675d75c71c81edcc8307338ed3571663 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix grammar in Performance docsMitch Curtis2015-09-191-1/+1
| | | | | Change-Id: I3e012d1124973d9f33123f6b68acfeffeeedb018 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Revert "Avoid calling potentially pure virtual method"David Edmundson2015-09-181-9/+18
| | | | | | | | | | This reverts commit 2d34ed2e655d79bed95859f1d32c2abfacbfb6f1. This change was only needed in Qt 5.4 Change-Id: Ica636da9a3deba68abbfda12e5ea72b296d9ad64 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Make QQuickFramebufferObject::layer::enabled workv5.5.1Gunnar Sletta2015-09-111-0/+6
| | | | | Change-Id: I95c88fa9b2dbb4f482286e4a22b608fbc450fb2b Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Make Canvas::layer::enabled workGunnar Sletta2015-09-111-0/+6
| | | | | Change-Id: I3e159ea6d02f415307db6d45470665085aaa023e Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Include doc note about Image::fillMode being excluded by shader.Gunnar Sletta2015-09-111-2/+6
| | | | | | Change-Id: I8731ea81421e8f6cea7d59bea82030d0855b0054 Task-number: QTBUG-48113 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Make Image::layer::enabled work as expected.Gunnar Sletta2015-09-111-0/+7
| | | | | | Change-Id: I0021ab5d3f51e47725cc0462ff74b6562d39c95b Task-number: QTBUG-48113 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* QQuickScreen: Use QPointer to guard QScreen referenceGabriel de Dietrich2015-09-091-1/+1
| | | | | | | | | We don't get any notification when the QScreen object is deleted, so the only thing we can do is guard it with a QPointer as it's done in QWindowPrivate. Change-Id: Icf0ba036ec27e70694807f3e66c744910a783185 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Doc: broken links and missing doc for functionsNico Vertriest2015-09-021-2/+2
| | | | | | | Task-number. QTBUG-43810 Change-Id: I14e03317d7470f33a899ba05b62b3d68fdb03734 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix hue clamping in Context2DLaszlo Agocs2015-08-241-1/+1
| | | | | | | | It goes from 0..359, not 0..255. Task-number: QTBUG-47894 Change-Id: I0612a9d5e4999afae7703b5c49741b94fb0da07f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix memory leak when QQuickPixmapReply::Event is delete before being usedAlbert Astals Cid2015-08-191-0/+7
| | | | | | | | | | | | | It can happen that QQuickPixmapReply::postReply is called, and before QQuickPixmapReply::event is called the object gets deleted. That means that the texture factory will never be deleted. To fix that we delete it in the destructor of QQuickPixmapReply::Event and set it to 0 in QQuickPixmapReply::event after assigning to the next data structure that will take care of it Change-Id: Ibea62f5a10a53cca586de7c5f03f00aabfb88b2e Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Fix casing in Models and Views documentation.Mitch Curtis2015-08-171-1/+1
| | | | | Change-Id: I461c5a55e3dbb2dc713640ec4d7aa00397a4415d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Support QSGGeometry::lineWidth also in the batched code path.Gunnar Sletta2015-08-172-18/+26
| | | | | | Change-Id: Ifc664b9c718744b9549953e42ac3450a88403dea Task-number: QTBUG-47090 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Fix crash in QQuickCanvasItem::updatePaintNode()Tobias Koenig2015-08-111-1/+5
| | | | | | | | | | | QQuickCanvasItem manages the life time of the texture already, so it shouldn't set the ownsTexture flag on the QSGSimpleTextureNode, because that would result in a double deletion when QSGSimpleTextureNode::setTexture() is called. Change-Id: I7c1cc949b664d1a8b64bab092250439171e66233 Task-number: QTBUG-47714 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Doc: added documentation to undocumented methodsNico Vertriest2015-08-044-1/+46
| | | | | | Task-number: QTBUG-36985 Change-Id: Idc6f7961f4f02f66dc3d4a8e5d09dd15d43b7757 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Fix selections in tables that span over several cellsEskil Abrahamsen Blomfeldt2015-08-041-7/+0
| | | | | | | | | | | | | | | | | In the code that converts text layouts to subtrees in the scene graph specifically for TextEdit, there was a cutoff to treat text tables as single nodes in the graph (for simplicity). However, this breaks selections, since the ranges spanned by each cell will be interpreted as overlapping, messing up the selection merging logic. We need the same approach here as for any other text frame where we check frame boundaries. [ChangeLog][TextEdit] Fixed issues with selections that spanned several cells in a table. Change-Id: I789041d84b5d163e209488f8f2f1f83a6471389f Task-number: QTBUG-46928 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix selecting single character in middle of stringEskil Abrahamsen Blomfeldt2015-08-031-5/+5
| | | | | | | | | | | | | | | The fix for QTBUG-46829 revealed a bug in the code to handle selecting part of ligatures. The ranges were assumed to be [start, end], while they are in fact [start, end>. This would cause the engine to assume the previous node overlapped completely with the selected node and that the node had thus already been added to the graph. Due to the bug in QTBUG-46829, this accidentally worked before, but when that bug was fixed, this bug appeared. Change-Id: I517d260de9f58db4504dd4320b7113fbbe305a81 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix disappearing selection spanning different scriptsEskil Abrahamsen Blomfeldt2015-08-031-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the way itemization is currently done in Qt, Cyrillic text (and other writing systems) separated by spaces will become separate items because the spaces are itemized as Script_Common. In the Scenegraph's text node engine, we should merge these items into a single node as long as the same font is used for all the text. But a bug in the engine caused this to fail when the text was selected. The symptom of this was that in some rare cases one of the items would vanish if it were in the middle of a selection. In order to support the bearing of selected text leaning outside the selection rect, I previously added a hack which would add all selected text as unselected text as well in b0783c21fb54b939f07ddf5658cc51113b8014e6. This was an awkward way of doing it and caused said regression. A less intrusive way is just to add the text to the scene graph twice, as this does not interfere with the logic needed to support selecting part of ligatures nor the engine's ability to merge nodes correctly. [ChangeLog][Text] Fixed regression with selections spanning different scripts. Task-number: QTBUG-46829 Change-Id: I0faed76fb2cd1ac0b2e5cc54b81008b5e2550733 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix typo in QSGGeometryNode documentation.Mitch Curtis2015-07-281-1/+1
| | | | | Change-Id: I0138aa116abdf890060e868fb95e866db1c7a398 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Oswald Buddenhagen2015-07-232-3/+10
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-202-3/+10
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
| | * Doc: Document limits of QSGGeometry::setLineWidth5.4Kai Koehne2015-06-041-2/+8
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-46260 Change-Id: Ib84a41da10d38391c3248a209a851f5b603d46b0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | * Doc: Added the missing \brief and \image to the example docsVenugopal Shivashankar2015-06-021-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41996 Change-Id: Ica6e069c7753a2004a4a4c0e93a49d1f240569d3 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | qquicktext: Fix using CSS line-height with RichTextKai Uwe Broulik2015-07-202-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Only if lineHeight has explicitly been set it will override the block format. Task-number: QTBUG-45204 Change-Id: I6e0d6dd70460cbf436dda3e5640bb9b1d16d7e5a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | Consistently use the override keywordThiago Macieira2015-07-198-20/+20
|/ / | | | | | | | | | | | | Clang doesn't like when it's inconsistent. Change-Id: Ib306f8f647014b399b87ffff13f23eebda07757b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Doc: replace Mac OS X with OS XNico Vertriest2015-07-153-3/+3
| | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: If21b4551eb95af3370cc21edd7a6721fc06e1346 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | doc: fix copy/paste error in warningGunnar Sletta2015-07-091-1/+1
| | | | | | | | | | Change-Id: I4a9a46913b589b14c879620848d76b31e435ee02 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Flickable: drag-over-bounds is not velocity-sensitiveShawn Rutledge2015-07-092-16/+34
| | | | | | | | | | | | | | | | | | | | | | The inspiration for velocity sensitivity was to make it feel more like native trackpad flicking on OS X. But on touchscreens it doesn't make as much sense, and it became too difficult to intentionally overshoot in applications that depend on pull-to-refresh functionality. Task-number: QTBUG-46108 Change-Id: I3fea5324aaac1f003ead200e14b0c76bd8c0ece6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix more casts that dropped the constness.Thiago Macieira2015-07-071-2/+2
| | | | | | | | | | | | | | Found with GCC's -Wcast-qual Change-Id: I66a35ce5f88941f29aa6ffff13dde502fccefb1d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Fix ICC warning about change of signThiago Macieira2015-07-071-2/+2
| | | | | | | | | | | | | | qv4typedarray.cpp(87): error #68: integer conversion resulted in a change of sign Change-Id: Iee8cbc07c4434ce9b560ffff13cf917dd8f9012e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Delete QQuickWindow's animator driver at the right time.Gunnar Sletta2015-07-044-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | For the non-threaded renderloops, we there might be a timer firing before the animationController is cleaned up through deleteLater() which will then reference the deleted QQuickWindow. Rely instead on direct and explicit cleanup at the right time in each render loop. Change-Id: Id81daddae78ce3922d6a932fb21200f2dc7955bb Task-number: QTBUG-33723 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | QSGSimpleTextureNode: Fix ownership of QSGTextureTobias Koenig2015-07-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-264-4/+7
|\ \ | | | | | | | | | Change-Id: I4020a1b3c59dea18faf7cbcbb78b90fcfc3680f0
| * | Version scrollGestureEnabled as a new propertyAlan Alpert2015-06-143-2/+4
| | | | | | | | | | | | | | | | | | Change-Id: I3408cf93a90327e8abbe2f8b7a85d8a84e24ae58 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 01:00:29 +0000