aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix parallel installation of qmltypes in a debug and release buildv5.15.0-rc2Kai Koehne2020-05-071-7/+19
| | | | | | | | | This duplicates the logic in qtbase/mkspecs/features/qml_module.prf to handle this situation (also for Android builds with multiple ABI's). Fixes: QTBUG-84019 Change-Id: I9ccbe4a3a79bb979bd6bb2758adb8c2e1ea7903e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15.0Qt Forward Merge Bot2020-04-271-2/+1
|\ | | | | | | | | | | | | Conflicts: src/qml/qml/qqml.h Change-Id: I34295e4ea3fc9ec2a42cb93df498d54a5583ddf1
| * Generate the docs for qmlRegisterSingletonInstance5.14Giuseppe D'Angelo2020-04-241-0/+4
| | | | | | | | | | | | | | | | I think qdoc is once more confused by the mismatch between the actual declaration and the signature in the \fn macro. Change-Id: I25d1be71ffdfc20961e23e06e9132ed09d1e29d0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Make no-opengl builds succeed with Vulkan or MetalLaszlo Agocs2020-04-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends c83ca003248a21e368ebfbf799ef9580e0f4e6ac. In Qt 5.x we do not support using Qt Quick with the QRhi-based rendering path in -no-opengl builds. (such builds default to the software backend in fact) This is due to structural difficulties, such as QSGDefaultRenderContext (the .cpp) being tied to direct OpenGL. This will only get solved properly in Qt 6 when the direct OpenGL code path gets removed. However, compilation should not break in -no-opengl builds, regardless of which other conditions (QT_CONFIG(vulkan), Q_OS_MACOS, etc.) evaluate to true. The original patch missed the case when we have Vulkan enabled or we are on macOS or iOS (which implies enabling the Metal code path). This is now corrected by extending the scope of the condition. Change-Id: I0e87d8b033aed8fdfaca826bcd32596a532380a7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io>
* | Fix crashes when draggingFriedemann Kleint2020-04-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | In QQuickWindowPrivate::sendFilteredPointerEventImpl(), it appears that the mouse event of the QQuickPointerMouseEvent can be reset in childMouseEventFilter(), causing a crash in QQuickPointerMouseEvent::isPressEvent(). Add checks QQuickPointerMouseEvent to fix this. Fixes: QTBUG-83411 Change-Id: I45f7406de4363974fc6adcac2999cdf55a0c84a7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge 5.15 into 5.15.0Alexandru Croitor2020-04-234-12/+11
|\ \ | | | | | | | | | Change-Id: I07b002df6a05efd577d4ff24e12ef932a4fe7836
| * | Doc: AnimatedImage incompatible with QQuickImageProviderNico Vertriest2020-04-232-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | - specify the incompatibility in AnimatedImage documentation - remove unwanted references to AnimatedImage in QQuickImageprovider documentation Task-number: QTBUG-83489 Change-Id: I6f72dde6b19983ff24d08330690d06c65356ccf5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Fix warning about deprecated "end" manipulatorThiago Macieira2020-04-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I9709abb1c3734e10a7defffd1607e09738faee69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Liang Qi2020-04-222-6/+18
| |\ \
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-04-222-6/+18
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/labsmodels/qqmltablemodel.cpp tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp This follows edc8512580fa16892dc13034e93300cc6a2bba59. Change-Id: I515d44d5d8309f4d7b911996c0ab65ea803176fa
| * | | WASM: Fix broken WebAssembly platform detectionFredrik Orderud2020-04-221-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing check did unfortunately not work, since Q_OS_UNIX is also defined in addition to Q_OS_WASM when building for WASM. The Q_OS_WASM check must therefore be done _before_ the Q_OS_UNIX check. Sorry for not testing this properly before submitting my previous patch. Change-Id: Ic0b75be626fa6c826dd2d4672a915c282ee03807 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15.0Liang Qi2020-04-222-6/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/labsmodels/qqmltablemodel.cpp tests/auto/qml/qqmltablemodel/tst_qqmltablemodel.cpp This follows edc8512580fa16892dc13034e93300cc6a2bba59. Change-Id: I42d1a977d33043045558118948db9151d03950c7
| * | Merge remote-tracking branch 'origin/5.14.2' into 5.14Qt Forward Merge Bot2020-04-212-6/+18
| |\ \ | | | | | | | | | | | | Change-Id: Icc410df82e57ed370ab0b80253074d495fc8c135
| | * \ Merge 5.14 into 5.14.2Kari Oikarinen2020-03-106-5/+45
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I294cb27a59754f7090f9bc1a500faf0423571549
| | * | | Don't replace all characters below 0x20 with spaces as they may be validAndy Shaw2020-03-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fonts will still render something for characters below 0x20 so these should not be replaced with a space and should just be left as is. It will not be rendered as a box if the dontPrint flag is set so we can trust the renderer to do the right thing here. Change-Id: Ie091c14713d8c2948c82b1991c295d80bc35dfde Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | | TableModel: Allow a double to be added to a field seen as int previouslyAndy Shaw2020-02-281-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the type for a TableModelColumn can be seen as an int when it is in the first row, it is still possible that it is representing a double value in other rows. Therefore it should be allowed to add/change a row that would display a double for that column. Change-Id: I994a8ead595f836a20a4e82fbf94953b1aa4b7da Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | | QQuickRepeater: Fix interaction with PackageFabian Kosmale2020-04-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 3b806a18cc665b5ae0e12d45fe170bfc3f00352a. Eric's change tried to tackle the issue by making the PartModel more well-behaved. However, this still left some issues, as exhibited by the linked bug. This time, we simply make the repeater more robust, and setup d->deletables if it's not done yet. Pick-to: 5.15 Fixes: QTBUG-71964 Change-Id: I58c80c84f73fddaea5d6030f92ffff219ecf2b71 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 28a31148ca02dbb530fd92dfafbcf71c64af4b70)
* | | | | Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-2110-32/+94
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: Iba61fff386b0d76e8d3dbb63e5b86ed8ee79d151
| * | | | WASM: Enable WebAssembly platform detection from QMLFredrik Orderud2020-04-212-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebAssembly seem to be missing from the list of reported platform in QML. Adding it to the list enables writing of work-arounds for wasm-specific bugs like e.g. QTBUG-83380 also in QML code. Change-Id: Ifc5966ee0da0e62bfd8d4a029e1a42962686e43c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-203-1/+7
| |\| | | | | | | | | | | | | | | | | | Change-Id: I5d7acb2a3883104d6002f147b58977ff58aa3383
| | * | | Make qdoc generate the documentation for qmlRegisterSingletonTypeGiuseppe D'Angelo2020-04-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I *guess* it wasn't find the "dummy" signature spelled in the docs, but only the actual one (with SFINAE), so the overload ended up being undocumented. Change-Id: I3c48057860c83dc78107e87b93616415976e802f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | | OpacityAnimator: apply opacity animation to the first frame in SGWang Chuan2020-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using OpacityAnimator, an opacity node will be created and inserted into nodes tree to perform opacity animation. However, since the default value of opacity node is 1, the opacity animation will start from 1 even if we set it from 0 to 1. Fixes this issue by updating the value of opacity just after creating a new opacity node. Fixes: QTBUG-79199 Change-Id: I2e462f0c56892fda040836ffde6685145769e60c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | | Fix enum setup optimizationMichael Brasser2020-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibba11705ff26176fe72b14f3bf462b7a12207295 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | | RHI: Fix build with -no-openglFriedemann Kleint2020-04-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is failing with a link error (missing QSGDefaultRenderContext). Task-number: QTBUG-83169 Change-Id: I0a3009a11269a7ffb142f2f51b6a1991d8ab3978 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | | Doc: Clarify what QQuickWindow::resetOpenGLState() resetsAndy Shaw2020-04-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As there is some confusion over what resetOpenGLState() actually resets, then this clarifies it to be clearer on that it only resets the internally changed states. Change-Id: Ie6f27e4772bd757d7d435575dcd9d711a1c6a9d7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | | qmltyperegistrar: Correctly handle foreign and super classesUlf Hermann2020-04-162-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if there were multiple super classes, revisions were only collected for the first one. Also, properties and enums declared in the type itself were ignored when QML.Foreign was specified. Finally, we would previously re-set resolvedClass and re-sort the revisions on each super and attached type. Change-Id: Iccb939cae66a5c4e2e5c312359e389463df80b4e Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | | Fix clipping of text with software backendEskil Abrahamsen Blomfeldt2020-04-161-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRawFont::boundingRect() returns the bounding rect of the glyph as reported by the system. On Windows, this unfortunately does not always include the antialiasing on the edges when the ClearType renderer is used (probably for compatibility reasons, since it matches the rendered size of the 8-bit alphamap.) Therefore, we have traditionally been applying a margin around rendering for 32-bit alpha maps, since there is no way to know for certain the exact rendered size with ClearType. It is tempting to expose the alphaMapBoundingBox through QRawFont (either replace the implementation of boundingRect() or add a new function) to avoid using private APIs here, but since it is a work-around and we hope the need for it will go away when we start using DirectWrite instead, it is better to keep it locked away for now. It is also too late to do such a change in Qt 5.15, so we can revisit the idea for Qt 6.x. [ChangeLog][Software Renderer] Fixed a bug where the last column of pixels in text would sometimes be clipped away. Fixes: QTBUG-80180 Change-Id: Ic611a80aef3e0e9b9cee0f3a22c9e24f717d5dfe Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | | V4: Avoid integer overflow in DataViewCtorFabian Kosmale2020-04-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-83667 Change-Id: Ia54510bd7c20fb232b117c1ea0fa5facfcd1a9a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Deprecate QSGEngineLaszlo Agocs2020-04-144-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and warn about QSGAbstractRenderer becoming private. Task-number: QTBUG-78596 Change-Id: If545e223907a90ae3bcfde235e9677e8a0a5899b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | Deprecate QSGSimpleMaterial and QSGSimpleMaterialShaderLaszlo Agocs2020-04-142-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-82988 Change-Id: I53695571641654b8a8aed990d9de6b9947bb1186 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | qmltyperegistrar: Retain alias and isFlag information for enumsUlf Hermann2020-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id484c7bb1a3ed3b2bf593f6197664e4ee2ad4006 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Avoid deprecated TouchPoint rect accessors in MPTA and QQWinPrivShawn Rutledge2020-04-072-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to 0124f73dfb779924e46eb8b319358dbbd5af2577 Change-Id: I8fa2e2fc8eae7a789a9d5e846f34c767c688b0e1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | QQuickTableView: fix crash in tableLayoutToString()Richard Moe Gustavsen2020-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function QQuickTableViewPrivate::tableLayoutToString() returns a string used for debugging the loaded table. If the table is empty, it will crash/assert while trying to read data out of an empty vector. This patch will check for this case before creating the string. Change-Id: I47c01b3c8447ccc7424fe475f38e22ff70c681d8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Add qmltypes for Qt.test.qtestrootUlf Hermann2020-04-064-52/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow this was missed when moving to static type registration. Change-Id: I33f0567449f7bce62b0cb71b9d4f0862ed801e59 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | qmltyperegistrar: Follow the private includes setting in qmltypesUlf Hermann2020-04-062-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file names need to be prepended with "private/" in order to be usable, that also holds for other tools that want to use them. Therefore, also add the prefix to the qmltypes files. We won't have a chance to figure this out again at a later point. Furthermore, don't add file entries for types we cannot register anyway. Change-Id: If04297db419e364f472b8ec627c599c0cbb4ffd9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | CMake: Fix double inclusion of CMake plugin targetsAlexandru Croitor2020-04-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 99ace38d22c640e37bb1a41095ee3b126169816a, all plugin files are included automatically, not only the ones ending in Plugin.cmake. Thus the extra inclusion done by the QmlConfigExtras file should only be done if strict mode is set. This fixes errors of the following type when doing find_package(Qt5Qml) add_library cannot create imported target "Qt5::QTcpServerConnectionFactory" because another target with the same name already exists. Amends 99ace38d22c640e37bb1a41095ee3b126169816a Amends 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4 Task-number: QTBUG-83282 Change-Id: I205036092bff9925aa95472f0aa6a212f0372227 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | TableView: Clarify the rows/columns docs about inserting/removingAndy Shaw2020-04-031-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-82904 Change-Id: Ib44122fd0c2e5fc83cfef1368ed4ec0f3b1951af Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Frederik Gladhorn2020-04-021-0/+6
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Frederik Gladhorn2020-04-011-0/+6
| |\| | | | | | | | | | | | | | | | | | Change-Id: I2193fb62d998f130c33adda340b0da45f7b418fb
| | * | | Fix QQuickMouseArea getting stuck in pressed state when hiding in pressFrederik Gladhorn2020-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the exclusive grab to hidden or disabled items with is good. But the change did not take into consideration how mouse area handles its internal state. As a simple example: A mouse area that would set itself hiddin in the press handler, would continue to have d->pressed == true, which means it would not react to any future press events. The fix is to let mouse area check in its change handler whether it has become invisible. The test also checks that enabled behaves the same way. There is no action needed, since mouse area does completely custom handling of enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't disable its children for example, it doesn't invoke QQuickItem::setEnabled at all. Due to this circumventing the common behavior, by chance disabling a mouse area in the on pressed handler works. Fixes: QTBUG-74987 Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | | | | fix -no-feature-translation buildTim Jenssen2020-04-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I817564e979d4c69f4d7ebd2c9e1d8cddf0727c13 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | | Add doumentation for nullish coalescingMaximilian Goldstein2020-04-022-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-83145 Task-number: QTBUG-81615 Change-Id: I87a2053aa560b434b6282f5dad852537ac0342cf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Doc: explain how to receive mouse press and release eventsv5.15.0-beta3Mitch Curtis2020-03-311-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: Icd6df727597659b81612a57a3e7e2e5b31adfef6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Fix signal emission order for zero-duration animationsJan Arve Saether2020-03-311-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order for non-zero-duration animations are: * started() * runningChanged(true) * stopped() * runningChanged(false) * finished() This patch tries to ensure that zero-duration animations have the same signal emission order. The problem was that when setRunning(true) was called on zero-duration animation, it would call itself (setRunning(false)) lower in the call stack in order to immediately stop again. This had the implication that we could emit stopped() even before started() was emitted (since the recursive call to setRunning(false) would actually complete before the ancestor stack frame setRunning(true) was completed) To fix this we emit started() *before* we call start() on the animationInstance. There is still a bug in that runningChanged(true) is still not emitted for a zero-duration animation, but this patch should improve the current behavior in the sense that stopped() is not emitted _before_ started(). Task-number: QTBUG-48193 Change-Id: Ic2bc85e648e6746f6a058e2e9136515e7fdb6192 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | qmltyperegistrar: Record header file names in qmltypes filesUlf Hermann2020-03-304-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We will need them to find the types in C++ code. Change-Id: Id00c6d855adbb767a0be8a9469fbe47447ccec8b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | qmltyperegistrar: Accept more file extensions as headersUlf Hermann2020-03-301-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, even if the file does not appear to be a header, still try to include it. People use strange file names. Change-Id: I2db7bd6aa14007a8b458c3860ba0553bb3b384b7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | QQuickPointerTouchEvent::touchEventForItem(): avoid deprecated accessorsShawn Rutledge2020-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifdf42f77ac3f79690e81392d85cd19667cc37f17 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-283-6/+10
|\| | | | | | | | | | | | | | | Change-Id: If7b3f7902eb18d586d8b721e77f4dfedc87cfb9a
| * | | Flickable: add nullptr check (crash seen only in release mode on windows)Nick Shaforostov2020-03-261-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2ac42ded0c2ed4dc3937a57f69109f10b19f9cc7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | PinchArea: document the pinch parameter for its signalsGiuseppe D'Angelo2020-03-211-4/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | The parameter was described in the documentation but missing from the signatures. Change-Id: Ie2718c9f2ac945ac7c8ea1555d097b426d9fba2a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 06:05:19 +0000