aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/5.14.2' into 5.14Qt Forward Merge Bot2020-04-215-6/+231
|\ | | | | | | Change-Id: Icc410df82e57ed370ab0b80253074d495fc8c135
| * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-171-0/+56
| | | | | | | | | | Change-Id: I54aae60a5ad987b7a9fd74c012f337952b855ec5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * Merge 5.14 into 5.14.2Kari Oikarinen2020-03-1014-30/+99
| |\ | | | | | | | | | 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-283-4/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | 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-073-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix QQuickMouseArea getting stuck in pressed state when hiding in pressFrederik Gladhorn2020-03-313-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | 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>
* | QV4Engine: Avoid memory leak in toVariant conversionFabian Kosmale2020-03-091-1/+5
| | | | | | | | | | | | | | | | We should really backport this to 5.14. Someone will hit it. (cherry-picked from commit 78fd438f158839ffebcd52cc7974eac28489dbdd) Change-Id: I2c713fd759ac40aaaac0c0943edb993d3e27686b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Make tst_qquickcanvasitem significant again; fix image size roundingShawn Rutledge2020-03-056-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - the test items must be visible, so that waitForRendering() works - arcTo::test_paint tried to render an out-of-bounds arc, which resulted in rendering nothing. Now renders within the 100x100 canvas. - painted() is not emitted the first time the Canvas is rendered. - Canvas.save() saves relative to the directory from which the test is run, while Canvas.loadImage() loads relative to the test data directory in this autotest (other tests are loading red.png for example). So we need to use absolute paths to test loading and saving in the directory where the executable is. - canvas.getContext('2d').getImageData(8.5, 8.5, 8.5, 8.5) now triggers different rounding behavior in QRectF::toRect(), after qtbase 88e56d0932a3615231adf40d5ae033e742d72c33: it becomes QRect(9,9 8x8). The assert in qt_create_image_data() needs to accommodate that. - Fixed another pedantic warning in qt_create_image_data a few lines above: if it creates the image itself, it needs to round the qreal width and height values. This reverts commit a23ee5c0de0d91859e1e76e64073861347dd9861 and amends 424cfef3cc3c140df51905713fa3849562bc494d and d142b2d212ea09a7919a0a2761ee9c04d5c9bda8. Task-number: QTBUG-41043 Change-Id: I825c2c5a2bbc8d5324c3ba41a681aa68bc25a159 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Blacklist a few more canvas testsShawn Rutledge2020-03-051-2/+8
| | | | | | | | | | | | Task-number: QTBUG-41043 Change-Id: I3a48439d30d9ec1cd908197c8d63984c95d336e3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | QQuickItem: prevent endless loop in focus tab chainWang Chuan2020-03-033-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the commit a18ab2a3822e0d, we promote the [startItem] in focus tab chain when it is invisible to prevent endless loop. However the problem still happen if the [startItem] is equal to [firstFromItem] Fixes it by compare the [current] item with the original start item Fixes: QTBUG-81510 Change-Id: Iae0207f39e2b8c4fc6ed0cf36f0a855668accfba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | QQuickTableView: Immediately delete delegates when possibleUlf Hermann2020-02-283-1/+30
|/ | | | | | | | | | | | In the dtor we don't need to care about any side effects a direct delete may have. Rather, any deleteLater() may not take effect anymore as the event loop may be gone already. Task-number: QTBUG-82000 Change-Id: I97935dc47fbbfd0c050e80c333c36a05f685c45d Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QQmlTableInstanceModel: Fix refcounting of metatypesUlf Hermann2020-02-272-4/+14
| | | | | | | | | | | | | | | The reusable items pool should only hold unreferenced objects. Therefore, we can immediately delete them when draining. release() is not suitable here because it unconditionally decreases and therefore underflows the refcount. Furthermore, the metatype is also refcounted, which means we should keep it in a QQmlRefCounter in order to not leak references. Task-number: QTBUG-82000 Change-Id: Iefdaaecc34342eb2e3b1e5a3281f2e46ac472347 Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Add section about QVariantList and QVariantMap as C++ propertiesUlf Hermann2020-02-241-0/+19
| | | | | | | Change-Id: Ie18661274880f45d911baf05797a8b384d72f9f7 Fixes: QTBUG-82249 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix build with -no-feature-networkUlf Hermann2020-02-243-0/+12
| | | | | | Fixes: QTBUG-82418 Change-Id: Ibceeefed75941d963e6b79b44e9231d0d8053221 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix texture coords for the compressed texture atlasMichael Brasser2020-02-211-5/+5
| | | | | | | | The texture coords should be based on the actual image size, and not on the padded size. Change-Id: I262b7ca93e26c48324ec892a988f2fc62132175e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Escape url.toString() before passing it to QRegularExpressionDmitry Shachnev2020-02-201-1/+2
| | | | | | | Otherwise the test fails when path contains special characters like ‘+’. Change-Id: I461d9755436148ce979284be31ef8d204235c8a4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QQmlAdaptorModel: Don't const_cast to call release()Ulf Hermann2020-02-191-1/+1
| | | | | | | release() is const. Change-Id: I00171af75151741e725cd2ceaa80afcaac4f62a3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: list Grid's alignment properties as "since 5.1"Mitch Curtis2020-02-181-0/+1
| | | | | | | | | They were added in 9b801abc3a6967392e27daa35ba7cd802b7164e4 (or 233e83b20512a5e3748542f1c279a5c7ec6310ad, depending on what you ask Gerrit or Git). Change-Id: Ia1c064c04bc3e1a23e6b8caf7d479625368f7fe6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Blacklist tst_qquickmousearea::pressOneAndTapAnother on OpenSuseUlf Hermann2020-02-181-0/+4
| | | | | | Task-number: QTBUG-82282 Change-Id: I4794bea023f45b3bdac2f19a68550c7116a49fa2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix inverted logicMichael Brasser2020-02-171-1/+1
| | | | | | | A texture has an alpha channel if it is *not* opaque. Change-Id: Ie7fdeb6e622dbb01e19b42877b27f0e0fe8959e2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Windows: Do look for <plugin>d.dll as a fallbackKai Koehne2020-02-151-1/+4
| | | | | | | | | | | | | Do look for d.dll as name of the library, even if Qt was built in release mode. This mitigates the change we did in Qt 5.14.0, where we switched the way our MinGW builds are configured from -debug-and-release to -debug -force-debug-info. But it is also more consisten in how we handle the release build, and macOS dylib loading. Fixes: QTBUG-81021 Change-Id: I73cd11941d86a732b92a3479d47b6e83a839994f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add a null check to QQuickWindowPrivate::rendererAnton Kreuzkamp2020-02-121-1/+1
| | | | | | | | | | | | | | | | Afaik there currently is no case in a regular execution where the renderer would actually be null, but for the sake of correctness add a null check as this seems to be the only code location that actually assumes the renderer to be non-null. Additionally, in order to en-/disable custom render modes at runtime, GammaRay actually needs to recreate the renderer and therefore resets the renderer to null in order for QQuickWindowPrivate::syncSceneGraph to recreate it. Thus we need a null check to make sure we don't crash in the short time frame where the renderer is null. Change-Id: Ief5c405f3bc8725d55e22cd33f2164830764e33d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* QQuickLoader: store statusFabian Kosmale2020-02-124-39/+91
| | | | | | | | | | This allows us to emit the change signal only when the status has actually changed. Due to alignment restrictions, this does not even change the size of the class. Fixes: QTBUG-82002 Change-Id: I2192bf80e72b92108046780811c3acdab39af518 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix a bug where a layout could crash or become non-responsiveJan Arve Sæther2020-02-125-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened because of that QQuickText is ill-behaving: When the width on a QQuickText with word wrap enabled is changed to something less than its implicitWidth, its implicitHeight is changed to reflect the height it needs in order to fit all lines. This will cause the layout to be invalidated, and rearranged again. However, at the same time it will also change its implicitWidth actually become wider than its initial implicitWidth (this seems to be a bug). So the next time it is rearranged it will actually be wide enough so that it doesn't need to wrap. This again will cause its implicitWidth and implicitHeight to change to reflect that only one line is needed, which again will cause it to rearrange, but since the item has a too small width for that it will again change the implicitHeight to reflect that it needs more lines..... This went on forever until there was a stack overflow. In addition it also caused an endless (that is, if it didn't stack overflow) updatePolish()/polish() loop (basically polish() was called from within updatePolish() continuously). To make the layout more robust for such "ill-behaving" items we have to add one recursion guard, and one polish-loop guard. Change-Id: I9f752ed320a100c8d0f0fd340347a556e63318e5 Task-number: QTBUG-73683 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix QQmlProperty and Connections for properties starting with '_'Fabian Kosmale2020-02-115-3/+58
| | | | | | | | | We do a weird renaming for the change handler of properties starting with '_', now we do it at least in a consistent way. Fixes: QTBUG-82017 Change-Id: I1535a5ee462f3a344c972461f1fb954f039aa854 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove /get from CMAKE_QML_DIRAndré Klitzing2020-02-111-2/+2
| | | | | | | Task-number: QTBUG-80843 Change-Id: I3a871930c9920159f455a1d4e8ef7c20e7966b52 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Mention styleName in the Font QML type documentationAndy Shaw2020-02-111-0/+1
| | | | | Change-Id: I1f2ec7b4bb96955f57b3afd4a295f04dbb70987f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Android: Don't include QtQuickParticles in the dependenciesAndy Shaw2020-02-101-4/+1
| | | | | | | | | | | | Before qmlimportscanner it was necessary to mark QtQuickParticles as a dependency, but now it is possible to have qmlimportscanner and androiddeployqt handle all of this for us. So we no longer need to make it an explicit dependency. Task-number: QTBUG-38296 Change-Id: I6e0baefdcf002746af26d8c95fa1f318770cc658 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* QV4Engine: Do not construct invalid QVariantFabian Kosmale2020-02-072-20/+27
| | | | | | | | | If the provided typeHint is -1, it does not make sense to construct a QVariant of this type and to check whether it is appendable. Fixes: QTBUG-81945 Change-Id: I32cbb9e70e210a7eca8d55801c1783338d1173b7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix QAccessibleQuickWindow::focusChild() to return focused descendantPeter Varga2020-02-061-2/+6
| | | | | | | | | | Same as the focusChild fix for qtbase: a132e02540 Fix QAccessibleWidget::focusChild() to return focused descendant Task-number: QTBUG-78284 Change-Id: Ibc3e3287790ebc879513a5b1a739e3a919e1f038 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Clarify the Binding.restoreMode warning messageUlf Hermann2020-02-031-7/+11
| | | | | | | | | | Specify that you need to import QtQml 2.14 and where. Fixes: QTBUG-81787 Change-Id: Ia8e7fb3229971294cbade2791075dcd0b5943fae Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Blacklist tst_qquickmousearea::nestedStopAtBounds on opensuse 15.0Ulf Hermann2020-02-031-0/+4
| | | | | | | | | This partially reverts commit 51e02fdc02c3cc2dbf9d2ba0b3fb709a6cd4e32e. Task-number: QTBUG-78153 Change-Id: I421fdc3acefd11cabfc192eb06c3cd92c0e76149 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Remove outdated noteJoni Poikelin2020-02-031-4/+0
| | | | | | | The behavior described in the note does not apply to Qt 5. Change-Id: Ia4d45ca35d095d6cdc193f276bd52c7ad403b82f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: Ia529cc8612d8fd4566c11aa01f89131ead7ac863
* Enable conversion from QJSValues containing arrays to container typesFabian Kosmale2020-01-315-7/+63
| | | | | | | | | | | | We started to convert containers to QJSValues, so that we could use them as JavaScript arrays. Unfortunately, this would then lead to a type missmatch when those same values where to be stored in a property of the container type. This commit fixes this by converting them back to the original type. Fixes: QTBUG-80916 Change-Id: I30a3b03e17c34b171d4a6881dfd7801c13e94d80 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix static builds due to name clashesAndy Shaw2020-01-311-7/+7
| | | | | | | | | When QtQuick and QtQuickParticles was linked into the same application then there was a name clash, so the classes in QtQuickParticles are renamed to avoid this clash. Change-Id: I8c2144ba7ad5838c95077a370ef400bd706fce8a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Run qtEnsurePluginResourcesCpp() from qtquickcompiler.prfUlf Hermann2020-01-301-0/+1
| | | | | | | | | This was missed when factoring out the resources flattening. Fixes: QTBUG-81699 Fixes: QTBUG-81713 Change-Id: I6ee42c0b91aaa57c593b218eb52359205098e5c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix some ListView bugs related to snapping when it had a headerJan Arve Sæther2020-01-303-15/+821
| | | | | | | | | | | | | | | Most bugs were related to the PullBackHeader header positining mode, for instance the old code did not take into consideration that for the PullBackHeader it was sometimes not sufficient to scroll the view. The header also had to be scrolled independently from the view: We achieve this by hooking on to the same timeline that is used for scrolling the view. (This way, both animations are synchronized, and they start and end at the same time). Change-Id: I75708c0fd8d4741032c04ad9ee144d7a49cf3359 Fixes: QTBUG-76362 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Get rid of global gadgetPtr in QQmlValueTypeUlf Hermann2020-01-297-69/+150
| | | | | | | | | | | | We should not keep user-created objects in global data structures. This is inherently thread-unsafe and crashes when the user passes static data and later unloads the same. Instead we keep the cached gadgetPtr wrapper objects in the engine now. Fixes: QTBUG-79553 Change-Id: I24ac3e84b572831d1d70b61b8a6001338579e284 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QQuickFlickable: fix division by zeroMitch Curtis2020-01-293-4/+64
| | | | | | | | | | | | | | | | | | | | The issue could be seen when enabling exceptions and running the following QML code: Flickable { id: flickable anchors.fill: parent contentWidth: 1000 contentHeight: 1000 Text { text: flickable.visibleArea.xPosition } } Change-Id: I615f9f9dc84903fb3a902f416a55e3ce3fece64c Fixes: QTBUG-81098 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Doc: document behavior and caveats of TextInput's padding propertiesMitch Curtis2020-01-281-0/+12
| | | | | | | Task-number: QTBUG-80699 Task-number: QTBUG-81679 Change-Id: I9c936a020ffa358dfa97d9b7044a90a27d3336dc Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-272-1/+93
|\ | | | | | | Change-Id: I424a0f7fe04ea801ed155bc27a91eace7ebaa843
| * Merge 5.14 into 5.14.1v5.14.1Kari Oikarinen2020-01-1518-31/+277
| |\ | | | | | | | | | Change-Id: Iefb900b42cc0476e62342724a5f3a480c09ce354
| * | Add changes file for Qt 5.14.1Antti Kokko2020-01-141-0/+89
| | | | | | | | | | | | | | | Change-Id: I3e657c2f231c5b5b8a851470f9a381e7eb29052e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 23:29:07 +0000