aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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: replaced \target with \keyword if at top of pageNico Vertriest2015-09-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A \target whose purpose is to link to the top of a page (and not to a section within a page) works better as a \keyword, because \target generates a new html anchor which, in this case, is not tied to any title element on the page. A \keyword links to the page itself, as expected. Change-Id: Ic7c83efc5066674aba3d65164bf2cf53697df4d6 Task-number: QTBUG-48482 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Flickable: remove spurious emission of content size changesJ-P Nurmi2015-09-291-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | If contentWidth or contentHeight is negative (unspecified), Flickable should not emit contentWidthChanged() or contentHeightChanged() when its own geometry changes. The value of contentWidth or contentHeight does not change. It remains negative (unspecified). Change-Id: Iad478d11e2e4370d2e94abe84cfd62d144e23dd9 Task-number: QTBUG-35038 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: replaced \keyword with \target when not at top of pageNico Vertriest2015-09-282-7/+7
| | | | | | | | | | | | | | Change-Id: I20bc53c71d6c3217ec51a3fd5ad8e5a38bb2043b Task-number: QTBUG-48482 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Mark Canvas::tileSize and Canvas::canvasWindow as obsolete.Gunnar Sletta2015-09-281-13/+4
| | | | | | | | | | | | | | | | | | The feature has never worked properly and the documentation is misleading. Task-number: QTBUG-33129 Change-Id: I75c5073ebf4ca10f45d42aca76444ab3d7fb3820 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Cleanup fontloader cache when QGuiApplication is destroyedJørgen Lind2015-09-251-8/+50
| | | | | | | | | | | | | | | | | | | | If this cache is used for a second instance of QGuiApplication then the cache is invalid. Change-Id: I02ca16dc03a1239b0ed50c7bcfbf87880ca8d948 Task-number: QTBUG-40861 Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Fix baseline of text with vertical align != TopEskil Abrahamsen Blomfeldt2015-09-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the height changes and the vertical alignment is center or bottom, we need to call updateSize(), since this updates the baseline offset. So we need to account for this case in the geometryChanged() handler. [ChangeLog][Text] Fixed baseline of Text elements where the vertical alignment was something other than top. Change-Id: I738c0603e7bf91e5e7ea1a40d4f925f41f868758 Task-number: QTBUG-43226 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Move remaining objects to new constructor syntaxLars Knoll2015-09-223-39/+28
| | | | | | | | | | | | | | Also disable the old way of constructing objects. Change-Id: Ib4e69087cd563ae1481da116d6caf97876239798 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | TextEdit: selectedTextChanged not emitted when calling select 2nd timeDan Cape2015-09-212-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qquicktextcontrol was only checking if the text was previous selected or not and if the current state matched the previous state it would not dispatch a selectedTextChanged event. This is wrong if you programmatically select text a second time with a different start or end of selection. You must notify that the selected text changed since visually you can see the highlight changed locations. When correcting this and creating a test case, it was seen that other tests had QEXPECT_FAIL set for this specific case. Upon further inspection, I could remove those calls and adjust the expected data that was set before the test (changing false to true). testing of tst_qquicktext: Totals: 182 passed, 0 failed, 0 skipped, 0 blacklisted testing of tst_qquicktextedit: Totals: 354 passed, 0 failed, 3 skipped, 0 blacklisted Task-number: QTBUG-38704 Change-Id: Ib5244dc264ab76951bb722a31dcb64717282725a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | ListView: Set currentItem's culled state on geometry changeGabriel de Dietrich2015-09-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the viewport is moved, the ListView may cull its currentItem if it's out of the viewport bounds. However, it could be that this is only a transient state while the currentItem is being animated. Unfortunately, we don't uncull the currentItem at any moment during the animation. To solve this, we simply set the currentItem's culled state every time its geometry changes. Change-Id: I72d548f13f229029ccd8568721ea23e73f7b4392 Task-number: QTBUG-48044 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix typo in scenegraph documentationMitch Curtis2015-09-211-1/+1
| | | | | | | | | | | | Change-Id: Iacab320dcedfc7ba1d12703f63a812f2660929b7 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Improve QQuickTextureFactory::textureFactoryForImage docuAlbert Astals Cid2015-09-211-1/+3
| | | | | | | | | | Change-Id: I80edbcf627c6a2ba27779d0edfe8f0343b765dda Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Introduce QQuickPaintedItem::textureSize and support HighDpi.Gunnar Sletta2015-09-156-42/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contentsSize/Scale/BoundingRect are confusing and will in most cases not produce what the user wants, but since they might be in use, we keep their behavior and simply obsolete them. New code should use textureSize, though most code can simply rely on implicit HighDpi support. [ChangeLog][QtQuick][QQuickPaintedItem] Implement high-dpi support and add function textureSize. This obsoletes the existing contentsSize, contentsScale and contentsBoundingRect functions. Task-number: QTBUG-32510 Task-number: QTBUG-40489 Change-Id: I660bbf394594b6ea588d4de9cc83c8c5eb28cb28 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Remove qml context related methods from QQmlV4FunctionLars Knoll2015-09-151-1/+1
| | | | | | | | | | | | | | | | They were only used in one place, where we can directly call the right method on the ExecutionEngine instead. Change-Id: I02bb16b07ef55ef66bbebb5a572cfbe27bcfcf7f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Handle TouchCancel events in MultiPointTouchArea.Andrew den Exter2015-09-151-0/+6
| | | | | | | | | | | | | | | | Ensure canceled has been emitted and the touch point press states have been reset after a touch cancel event. Change-Id: I421e8e4bdc6793b5ddc4b905ffecef91cf61ed9d Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | Fix MouseArea stealing mouse grab after release.Andrew den Exter2015-09-151-0/+1
| | | | | | | | | | | | | | | | | | This was preventing child items from receiving a release event and making the MouseArea the mouseGrabber when the mouse wasn't depressed. Change-Id: I93a9f4d6bd94041879ea13efda40c8d1dbb63a88 Reviewed-by: Mikko Harju <mikko.harju@jolla.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | Move all bools of painternode to the end as bitfieldsGunnar Sletta2015-09-152-13/+13
| | | | | | | | | | | | | | Saves us a few bytes Change-Id: Ie2cdda5ca0cd4a82aa00ea26e28418e6b027afac Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Update QQuickPaintedItem::FastFBOResizing docs.Gunnar Sletta2015-09-151-5/+6
| | | | | | | | | | Change-Id: I129307816adcbddcf1cbf6013ef736c03b130f19 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | QQuickTextPrivate: export as Q_QUICK_PRIVATE_EXPORTLiang Qi2015-09-141-1/+1
| | | | | | | | | | | | | | | | Used in Label of QtQuick.Controls 2.0. Change-Id: I68ce9f5caccc9ef090b4200f3a831eb18d9c692a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Move createQmlCallableForFunction out of the binding wrapperLars Knoll2015-09-081-1/+1
| | | | | | | | | | | | | | | | | | It's now QV4::FunctionObject::createQmlFunction, which I believe is a better place and name for the method, esp. as it has no real connnection to the binding wrapper anymore. Change-Id: I59e20e120db72e53735b3a986e0b91bc7c3347d7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Avoid crashing when not having a screen for the contextLaszlo Agocs2015-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disconnecting the screen to which the context belongs results in a null QOpenGLContext::screen(). Fall back to qguiapp's devicePixelRatio() in this case (giving the highest dpi in the system) due to the lack of any other option. This will fix the crashes when rendering offscreen (QQuickWidget) and using native text rendering. Without this the render attempt after disconnecting the screen with which the context was created would crash due to accessing the already destroyed screen instance. Task-number: QTBUG-42803 Change-Id: Ie5889f59e5d66d09329b3d5fb8e1365d14d5b8fc Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | QQuickText: add a protected constructorLiang Qi2015-09-082-0/+9
| | | | | | | | | | | | | | Which is used in Label of QtQuick.Controls 2.0. Change-Id: I1228dba59a2a247c8d9556eed7c9a97782d91668 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add Q_DECL_OVERRIDE to qsgbatchrenderer_p.hAlbert Astals Cid2015-09-081-3/+3
| | | | | | | | | | Change-Id: I6e1f03bad9e957a60e1248e423f6a0e237d43f55 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Doc: Corrected link errorsNico Vertriest2015-09-073-3/+3
| | | | | | | | | | | | Change-Id: Ia3973c9d46a9fe8c511d24e20c9c23a1c7d4660d Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | TextInput & TextEdit: allow controls to override the implicit sizeJ-P Nurmi2015-09-064-11/+21
| | | | | | | | | | | | Change-Id: I4b5eae46a9fef574249eee9061858bdf874c54be Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Item views: Don't emit 'currentItemChanged' if the current item didn't ↵Gabriel de Dietrich2015-09-051-1/+2
| | | | | | | | | | | | | | really change Change-Id: I8892bb9b6ab6737d4a6f6f8aab836f863668682e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickView/QQuickWidget::errors(): fix crashJ-P Nurmi2015-09-031-1/+1
| | | | | | | | | | | | Change-Id: Ie37ed5fac642931b658d2b738ddd45d23cda54c6 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Shortcut: add sequenceString propertyShawn Rutledge2015-09-033-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | If you set sequence to a StandardKey, then read back the property, you will get an int, which is not suitable for display. Now you can use sequenceString for tooltips, preference dialogs for setting shortcuts, and such. [ChangeLog][QtQuick] Added Shortcut.sequenceString property to read back the key sequence as a displayable string Change-Id: I63ee46f8a2c2da1b1c803282baa894fb1667fe67 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-09-022-3/+3
|\| | | | | | | Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
| * 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>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-08-281-0/+7
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-211-0/+7
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tools/qml/main.cpp Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
| | * 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 compiler warnings on recent clangLars Knoll2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Add some Q_DECL_OVERRIDE and a cast Change-Id: I834d16049805b5fc6e64a64d26cd6c92ac873163 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Add isTabFence private flagGabriel de Dietrich2015-08-212-19/+78
|/ / | | | | | | | | | | | | | | | | | | | | | | When an item has this flag set, the user can't tab-navigate either out of it, or enter it. We use this flag to implement QQuickPanel as an item for platforms that only support one single top-level window. Change-Id: I1f4313912ae1c70217af0d4d21064932b50a9438 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Fix rendering to QQuickWindow::renderTarget.Gunnar Sletta2015-08-201-3/+6
| | | | | | | | | | | | | | | | | | When setting an FBO, the size of the window should be irrelevant, so we need to use the renderTargetSize to specify the viewport and device rect. Change-Id: Id76736cfaf6c511439bb8af80e3c641025d9d547 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add possibility to mirror ShaderEffectSource generated texturesMiikka Heikkinen2015-08-208-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | Using textures generated by ShaderEffectSource items (or Item.layer) with custom OpenGL code was non-intuitive due to mismatching coordinate systems, so added a possibility to control the generated texture orientation. [ChangeLog][QtQuick][ShaderEffectSource] Added possibility to mirror generated OpenGL texture. Change-Id: I7c03d8b6fbfc43d69812c15d244200fb8e7c7bb9 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | QQuickImageBase: Use QUrl::path() instead of QUrl::toString().Robin Burchell2015-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | This copies less data, which is faster. Increases creation/delegates_image from 560 ops/frame to 600 ops/frame for me. Change-Id: I9c230bb9fa82fd631020881fb741857285589bca Suggested-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Switch to the non compat metacall overloadLars Knoll2015-08-192-7/+9
| | | | | | | | | | | | | | | | | | This one passes in the qobject that the metacall is being applied to. The long term goal is to make the vme meta object independent of the QObject instance. Change-Id: Ide34b8637b9963bdb5e87e4aa6e9c2ee825293f7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Improve QQuickImageResponse::textureFactory documentationAlbert Astals Cid2015-08-191-2/+5
| | | | | | | | | | Change-Id: Id754f1f1454af566cb3cf20f5ca947f972ef2caf Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Fix memory leak when using async image providersAlbert Astals Cid2015-08-191-0/+1
| | | | | | | | | | Change-Id: I08392ab0a3edb1ac162110ebc349ad457800c788 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Get rid of special handling of var propertiesLars Knoll2015-08-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | These can be handled in a simple way now by using a special propertyType value indicating that we have a var property. Also remove the additional write calls in the different readProperty implementations. If the stored data doesn't match, we can simply return the default value directly. Change-Id: I3823a971df24bd78f0acdc4c0042776277b3c55f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Update copyright notice.Frank Meerkoetter2015-08-181-0/+1
| | | | | | | | | | | | | | Update the copyright notice on files containing larger changes from me. Change-Id: I46cb83161331ef2f49a6ec92c078d6dc8019081e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove QQmlVMEVariant specific workaroundFrank Meerkoetter2015-08-181-9/+1
| | | | | | | | | | | | | | | | A Q4x4Matrix wouldn't fit inside a QQmlVMEVariant. Therefore it was wrapped in a QVariant. Change-Id: I68864e456a4fd76143277d5a10d1a3f307e833f2 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove unused codeFrank Meerkoetter2015-08-181-25/+2
| | | | | | | | | | | | | | | | The QQmlObjectCreator is the only user left. It is using it only with QVariant::Color. Change-Id: I5091fd160841118bee5d6cf6e30798f66c277b69 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 13:41:15 +0000