aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Make vulkanunderqml work and update docsLaszlo Agocs2019-09-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What we are doing for now is setting ExternalContentsInPass always. This way vulkanunderqml works as expected. For applications that do not integrate external rendering this means that there is now an additional secondary command buffer per render pass, but we can live with this for now. Later (Qt 6) there should be a way to declare this (that the application will want to issue native rendering stuff) up front in QQuickWindow or somewhere. Change-Id: I736741f9b0eee2f8295b046bacdce862e6a546f5 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Fix pedantic warnings in QQuickImageShawn Rutledge2019-08-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - semicolon after switch is not necessary - a switch that covers all possible cases should not have a default case: that way if someone adds another enum value, she needs to think about what it means in that switch - hopefully it was not intentional to ensure that targetRect has integral size in the PreserveAspectCrop case; it's not an explicit cast, so it looks like a mistake Change-Id: Ie7525137e826ed3ea03ac1dc9d2563e791379b42 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | | Add a createTextureFromId() alternativeLaszlo Agocs2019-08-302-7/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say hello to createTextureFromNativeObject(). This is the future replaecment for createTextureFromId(), and is capable of operating on both the direct OpenGL and the RHI code paths. In practice this allows creating a QSGTexture that wraps - but does not own - an existing VkImage, ID3D11Texture2D*, MTLTexture*, or GLuint. Change-Id: I500ee4c76da67eca1a70599a30b03d7b126b570d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | QQuickFbo: add the RHI warningLaszlo Agocs2019-08-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This class will probably go away in Qt 6. "Probably", because it is not yet clear if/how an alternative will be provided. Change-Id: Iba205c394a97bf8d2c1001f8f42ad26be6841b09 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Fix build with -no-feature-quick-pathJohan Klokkhammer Helsing2019-08-301-0/+2
| | | | | | | | | | | | | | | Change-Id: I7ed2c190ffe9ddd83aeee28de3c5d87269ec53ee Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | QQuickDragHandler: Add revision to snapModeUlf Hermann2019-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | This property was added in Qt 5.14. Change-Id: I48ebc614490e67440419965983126740c4443d0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Harmonize meta object revisions and minor versionsUlf Hermann2019-08-2613-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid complexity we want those to match. We can easily "rename" the meta object revisions as those are not public interfaces. Change-Id: I48e063d49758c7bacd9b7816bf5541cf67e07b0d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | QQuickPinch: Declare notify signal for targetUlf Hermann2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can figure out from the metaobject that this signal actually notifies about target changes. Change-Id: I2151990e906e375f807b2d952e8f183a19529394 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Move currentFrame and frameCount properties up to QQuickImageBaseShawn Rutledge2019-08-248-8/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnimatedImage already had these properties, but some typically non-animated image formats such as PDF, TIFF and ICO can also support multiple pages. In either case, the currentFrame property can be used to select a specific frame or page. However an AnimatedImage uses a QMovie to do that, whereas a plain Image uses QQuickPixmap. So the accessors need to be virtual in order to have these different implementations. [ChangeLog][QtQuick][Image] Image and BorderImage now have currentFrame and frameCount properties which can be used to step through the frames of multi-page image formats such as TIFF, WEBP and ICO. Task-number: QTBUG-77506 Change-Id: Id4d95a99a26a862957e44b1bd8ffe06d7eababef Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Remove usages of deprecated APIs of QWheelEventSona Kurazyan2019-08-233-4/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I69b0c4ec7c03f9421b18828516e064eff2b45518 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | QQuickImageBase: prepare for rescalable PDF as an image formatShawn Rutledge2019-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickImageBasePrivate::updateDevicePixelRatio() assumes that only SVG or an image provider can provide a scalable image. Now that PDF will be supported, we can add it to the list. Change-Id: I9a6df7c58cb9db0e8d4d159c138bedd481281d92 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | rendernode example: Add support for MetalLaszlo Agocs2019-08-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus clarify QQuickWindow::begin/endExternalCommands() in combination with QSGRenderNode in the docs. As the example demonstrates, calling these functions is not necessary within render() of a render node. Also fix an issue with resetting the scissor in the renderer after calling render() of a QSGRenderNode. Change-Id: If8c2dab38d62aa444266d37901f062a51e767f68 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | qqml.h: add qmlRegisterAnonymousTypeFabian Kosmale2019-08-211-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This version behaves for the most part like qmlRegisterType(), but it adds a uri and major version, which qmlplugindump can use to put the tpyes into the correct plugins.qmltyes file. Change-Id: I50f620216439a3edc66ac740cb051c2fbb936e51 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-201-1/+1
|\| | | | | | | | | | | Change-Id: I9ce3eee3d6f88783b9e20110a2814bee805291a4
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-051-1/+1
| |\| | | | | | | | | | Change-Id: I042df89ddd381c7fbb944b7ff49d5b45b764fd47
| | * Fix possible crash with top/bottom aligned imagesEskil Abrahamsen Blomfeldt2019-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An image inside at the end of a text block which did not start at text position 0 would resolve to an invalid QTextLine, since we passed the document position to lineForTextPosition(), which expects the relative block position. If the image was aligned to top or bottom, so that the extracted QTextLine was actually accessed, this would cause a crash. [ChangeLog][QtQuick][Text] Fixed a bug where aligning an image to "top" or "bottom" could cause a crash under certain circumstances. Task-number: QTBUG-77217 Change-Id: Iaa239ba482f2a765703656e4116cbebb8435a66e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Introduce functions to set properties during creationFabian Kosmale2019-08-193-1/+20
| | | | | | | | | | | | | | | Change-Id: Idd4c8ab9e34b9bc3e00f21d7cf1e4f1a70586e7f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Fix build without features.quick_gridviewTasuku Suzuki2019-08-191-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I35303ee67d5976c54b5672d0e2333e8533552986 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Add an initial set of scenegraph docs for the rhiLaszlo Agocs2019-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just the basics for now. Start moving away of the assumption of default backend = direct OpenGL, but limit the amount of RHI-specific details for now. This should be sufficient for the first preview in 5.14. Change-Id: I94e80d5fbed1269f7e8911284c28ac5fbc858be7 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | Use QSH::mouseDoubleClickDistance() and touchDoubleTapDistance()Shawn Rutledge2019-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in documentation links and in implementation, now that they have been added. The doc links to QPlatformTheme::MouseDoubleClickDistance and QPlatformTheme::TouchDoubleTapDistance were dead ends because of those being private; and user code needed a way to read the values. So now there is new API in QStyleHints. Fixes: QTBUG-76944 Change-Id: I86bce4c7fe08c9da33745a4eed450757b3a30b03 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Implement QSG_VISUALIZE for RHILaszlo Agocs2019-08-071-0/+7
| | | | | | | | | | | | | | | Change-Id: I6343f316e2ecff4e4d7454fb450a1bd0c5a917b8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Remove usages of deprecated QSignalMapperSona Kurazyan2019-08-012-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code using QSignalMapper relies on dynamic property inspection, and therefore can't use the lambda syntax for capturing the int value. Since there is only one sender object, replace QSignalMapper with a simpler mapper class, which emits the mapped signal by passing the saved member value. Task-number: QTBUG-76491 Change-Id: I6e8e527b1a92d39a1711d85c203df704c293d294 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-264-5/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/handlers/qquickpointerdevicehandler.cpp src/quick/scenegraph/qsgdefaultglyphnode.cpp src/quick/scenegraph/qsgdefaultglyphnode_p.cpp src/quick/scenegraph/qsgdefaultglyphnode_p_p.h tests/auto/qml/qjsengine/tst_qjsengine.cpp Done-With: Jan Arve Sæther <jan-arve.saether@qt.io> Done-With: Laszlo Agocs <laszlo.agocs@qt.io> Change-Id: I35749152f8dce44b9af8d52b1283629879010f11
| * | Doc: Add doc on "quit" shortcut behavior in macOSNico Vertriest2019-07-171-0/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-71098 Change-Id: Ifc30bfd5abc4a889a2436c8ae977c8e988fb700f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.12-merge-5.13Edward Welbourne2019-07-172-2/+5
| |\| | | | | | | | | | Change-Id: I9b1cfefda23febfb24282bc30bc38865499ec2f4
| | * QQuickItemView: refill itself before populate transitionWang Chuan2019-07-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view uses a visible items list, which is maintained by the refill() method, to determine which items should be triggered to do the populate transition. The refill() was only invoked when component completed before doing the populate transition; but if the size of the view depends on the size of window (for example, using anchors.fill), more delegates could become visible after component completed. In such a case, part of visible items were not be triggered to do the transition. [ChangeLog][QtQuick][Item Views] Item views such as ListView now properly populate delegates with a populate transition when the view is resized after componentComplete. Fixes: QTBUG-76487 Change-Id: Id90c3f73d9911c8a1d6d8b1ea0c51f6c27d0ed5b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Fix static buildSimon Hausmann2019-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the GL attribute name helper functions only from QtQuick to avoid a clash of symbols when linking statically. Change-Id: Ic95b984092f5db222db6dc1f4ac5fb443b5ab714 Fixes: QTBUG-77012 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-121-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Required a change to a #include; qquicksinglepointhandler.cpp was (at least on Android) only seeing QQuickSinglePointHandler as a forward declaration, so dereferencing it was a problem. The header that defines it does #include the one it replaces here. Change-Id: I6bc30ff9a91f55350172e4a4bcaaa7f99a2ffb28
| | * Notify QQItem::mouseUngrabEvent() when an Event Handler steals grabShawn Rutledge2019-07-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already took care of cases when the handler is a child of the Item, grab transitions involving Flickable etc.; but the bug is about a simpler case when the handler is in the parent of the item that has the grab, and steals from it. Amends 38a016c7b1337d83d77879f45b4a2e6fec11d049 Fixes: QTBUG-71218 Fixes: QTBUG-75025 Change-Id: Id1d6d370e0db75c59ec7dce4a8e545701c501827 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | | Add QQuickPathMultiLinePaolo Angelelli2019-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And show our users even more love. This path element allows to specify a list of polylines as a single list of lists of points. [ChangeLog][QtQuick][Path] Added QQuickPathMultiLine. Change-Id: Idf1d1dcd928bb19b9ad995322f86822448811537 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Fix build without quick_itemviewTasuku Suzuki2019-07-091-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ice015e39d54d0e7c2f77b365195c986d7c9d1d92 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Make openglunderqml functional with and without the rhiLaszlo Agocs2019-07-041-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has to be written following the new split approach (beforeRendering for resource setup, beforeRenderPassRecording to issue the actual underlay draw calls), but it will then work both with and without QSG_RHI=1. Change-Id: I9b7b35434aa0caec543cae268064b2684256382d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-041-6/+7
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20ad6f8a260f387a3b73566a32c35a5772b401a5
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-031-6/+7
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icd05d016de5b4cf9af5234cb47b5c3fd0f6a053e
| | * Fix read access violation when using KeyNavigation attached propertyTom Scheler2019-07-021-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the KeyNavigation.up property of an item to another item will implicitly set the reverse (KeyNavigation.down) property on that other item pointing back to the item. Once the item is destroyed, you will have an invalid pointer stored in the other item pointing to the destroyed item. Using QPointer<> instead of raw pointers fixes that issue, because they will become null on QObject's destruction. Added QQuickItem test that verifies the issue is solved. Fixes: QTBUG-75399 Change-Id: Ibb3e976c4eb9fcd81604bcc2eb757257d3653930 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Add the graphics api independent scenegraph portLaszlo Agocs2019-07-0418-53/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opt in via environment variables: QSG_RHI=1 -> enable using QRhi instead of GL QSG_RHI_BACKEND -> set to vulkan, metal, d3d11, gl to override the default (the default is d3d11 on Windows, metal on Mac, gl elsewhere) Or force a given rhi backend via the existing QQuickWindow::setSceneGraphBackend(). Otherwise the default behavior is the same as before, the rhi code path is never active by default. -no-opengl builds are supported in the sense that they work and default to the software backend. However, the rhi code path cannot currently be used in such builds, even though QRhi from qtbase is fully functional with Vulkan, D3D, or Metal even when qtbase was configured with -no-opengl. This cannot be utilized by Quick atm due to OpenGL usage being all over the place in the sources corresponding to the default backend, and those host the rhi code path as well. This will be cleaned up hopefully in Qt 6, with the removal all direct OpenGL usage. Other env.vars.: QSG_RHI_DEBUG_LAYER=1 -> enable D3D debug or Vulkan validation layer (assuming the system is set up for this) QSG_RHI_SHADEREFFECT_DEBUG=1 -> print stuff from ShaderEffect QSG_SAMPLES=1,2,4,... -> MSAA sample count (but QSurfaceFormat works too) QT_D3D_ADAPTER_INDEX=0,1,... -> D3D adapter index QT_VK_PHYSICAL_DEVICE_INDEX=0,1,... -> Vulkan physical device index QSG_RHI_UINT32_INDEX=1 -> always use uint index data (both merged/unmerged, convert when needed - with some rhi backends this is implicit) QSG_RENDER_LOOP -> to override the render loop as usual. The default with RHI is threaded for Metal, threaded for Vulkan on Windows, basic for Vulkan on Linux and Android (to be checked later), while the existing rules apply for OpenGL. Not supported when running with QRhi: - particles - compressed atlases (though this is transparent to the apps) - QSGRenderNode - QQuickRenderControl - QQuickFramebufferObject - certain QQuickWindow functionality that depends directly on OpenGL - anisotropic filtering for textures - native text may lack some gamma correction - QSGEngine applicability unclear - some QML profiler logs may be incorrect or irrelevant Change-Id: I7822e99ad79e342e4166275da6e9e66498d76521 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | qtlite: Fix build with -no-feature-cursorMikhail Svetkin2019-07-031-0/+4
| | | | | | | | | | | | | | | | | | | | | Change-Id: I10140b5b2bb6c08e9de6c0300377466325ba4bde Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Intercept image source urlFabian Kosmale2019-07-031-0/+5
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-55027 Task-number: QTBUG-76879 Change-Id: Id0c7b33cf22827ebc984c4ee848ef4f63c359b20 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-012-9/+21
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/imports.pro src/qml/qml/qqmlmetatype.cpp Change-Id: I308436caf55402cb2246cb591c6ac8f83e1febf8
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-282-9/+21
| |\| | | | | | | | | | Change-Id: I59343fe228ca6b823b61577e5a0907e7381899c2
| | * Fix: ListView footer positioned wrong after last item removedEirik Aavitsland2019-06-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refill() method would bail out early on an empty model. Make sure that it at least updates the header and footer in such situations. Fixes: QTBUG-31677 Change-Id: I1f3a1848ff263a8f7f9ccfc3b20f16b61348f57b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * QQuickItemView: fix crash while doing fast flicking in transitionsYulong Bai2019-06-262-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause was that fast flicking kicked items in and out of viewport, while in transition, they would abruptly having tracking data structure , i.e. releasePendingTransition of QQuickItemViewPrivate, got iterator invalidated. This also helps to resolve QTBUG-44308. Fixes: QTBUG-76433 Fixes: QTBUG-44308 Change-Id: If14533d3f6b1acd7b6ca0c5c723347c0cb3f54dc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | QQuickTableView: Add usage of QQuickTableSectionSizeProviderYulong Bai2019-06-281-0/+12
| | | | | | | | | | | | | | | Change-Id: Ib8417729d439cf0c638dae7a43025aa315406793 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Expose QQuickPath::pointAtPercent as Q_INVOKABLEPaolo Angelelli2019-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So it can be used in QML. Useful in combination with ShapePath, in order to add graphics along a Shape. [ChangeLog][QtQuick][Shapes] Exposed QQuickPath::pointAtPercent as invokable in QML. Change-Id: Ia8aeb2b74003410ce16d9d2a0c62d79a021530af Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Add Markdown support to TextEditShawn Rutledge2019-05-296-5/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - textFormat can be set to MarkdownText, and markdown can be loaded into the text property - markdown text can be pulled out of the text property - if there are lists with checkboxes, you can click them to change the checkbox state Change-Id: I450115c732d737446ae71806e4abb18e8cc639f3 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | | Add QQuickPathPolylinePaolo Angelelli2019-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And show our users some love. [ChangeLog][QtQuick][Path] Added QQuickPathPolyline. Change-Id: I0fb78ae3e4e7c65e81e100595dc1eb16f88a68ed Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | QQuickRectangle: do not pass invalid presets onto QGradientGiuseppe D'Angelo2019-06-241-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGradient isn't meant to have a wide contract and filter out garbage. Since we're parsing ints / strings as gradients, do the validation at this level. Change-Id: I271b5ed1b908d698a2d2c871abf5e61d1e565451 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Remove qqmlmemoryprofiler*Ulf Hermann2019-06-132-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've never seen it used and I've never seen the companion library required to operate it. Change-Id: I5a0e6aed9a416f1bd26dea97def9667a11a4d77d Reviewed-by: Robin Burchell <robin.burchell@crimson.no> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-206-17/+16
|\| | | | | | | | | | | Change-Id: I71b1212085da85f03f4ff0e3ee5cb56a401998ae
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-196-17/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/sharedimage/qsharedimageloader.cpp src/quick/items/qquickitemviewfxitem_p_p.h Change-Id: I12ce7c32788f4a394188a934e689b4ebac78138b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 19:42:13 +0000