aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QQuickPixmapCache: Don't dereference nullptrv5.14.0-rc2v5.14.0Fabian Kosmale2019-12-053-3/+31
| | | | | | | | | | Consistently check that job->data is not null before derefencing it. Fixes: QTBUG-80510 Fixes: QTBUG-79937 Change-Id: I894503ddd2254814463073cc12f8365641efc689 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QML: Resolve conflict in ImportSpecifier rulev5.14.0-rc1Ulf Hermann2019-11-291-1/+5
| | | | | | | | | | | | | | | | | IdentifierReference could resolve to both ImpordBinding and IdentifierName, causing ambiguity in the grammar, and ultimately caused parse failues when parsing an import statement. This is now resolved by explicitly telling the parser to prefer shifting. This is a partial cherry-pick. Apparently the effect observed in the original change and fixed inline can also be triggered in different ways. (cherry-picked from commit 41bbf7e376d0e374dc7c4e2a5ed4157a1b880b4a) Fixes: QTBUG-80423 Change-Id: Iaec29c452b577312248a17cb48f005f4fc0bd8c4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add changes file for Qt 5.14.0Antti Kokko2019-11-281-0/+372
| | | | | | Change-Id: I10bcc4794f8f09ae8c0042737b6da2e5b810d7af Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* mouseDrag(): ensure that intermediate moves are done for all dragsMitch Curtis2019-11-262-9/+39
| | | | | | | | | | | | | | | | | | The code checking if the intermediate move distance was less than the drag threshold, but without accounting for negative distances. Since the negative distances were naturally less than the drag threshold, the intermediate distances were set to zero and the intermediate moves were never done. In practice, this means that mouseDrag() never did intermediate moves (i.e. what happens during a drag in real life) for drags that go from right to left or upwards. Task-number: QTBUG-80152 Change-Id: Ic27021f5ce5ba2937e95fb2dfb532bd2136f4205 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit fad8ef3e4133538e3785d7067c35c652bc894711) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix NativeRendering text on core profileEirik Aavitsland2019-11-263-3/+3
| | | | | | | | This is a continuation of af090d8, making sure the same dpr snapping is done in the core profile shaders. Change-Id: Iccd19a377968fb7bfbd49c3ef13b72284a48bab1 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* TableView: use fetchMore() when scrolling to the end of the tableKari Hormi2019-11-206-0/+61
| | | | | | | | | | | QQmlTableInstanceModel implements canFetchMore and fetchMore functions, but these are not called at any point in QQuickTableView. This change checks if additional data can be fetched when atYEndChanged signal is emitted. Fixes: QTBUG-78273 Change-Id: I49b41b09d9a218826b34f32cd9fe4724a6097b52 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Fix: NativeRendering text for non-integer screen scalingEirik Aavitsland2019-11-187-6/+51
| | | | | | | | | | | | | | Commit 6e883c53 introduced snapping to pixel grid for non-integer device pixel ratios. But the snapping also modified the w element of the coord vector, which resulted in mangled and offset rendering. As a driveby, add the dpr snapping also to the outlinetext shader, as it improves rendering quality. Fixes: QTBUG-70481 Fixes: QTBUG-78160 Change-Id: I4c4b1788005514adc0255878ba24cdf1acc6755f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Retrieve the attached properties base type without recursionUlf Hermann2019-11-185-32/+29
| | | | | | | | | This is probably faster and avoids the deprecation warnings stemming from deprecated functions calling themselves recursively. Task-number: QTBUG-80040 Change-Id: I2f65aad3bc7f85b7a7de66d3e76dac1233a58db8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Disable deprecation warnings in function that are themselves deprecatedUlf Hermann2019-11-181-0/+8
| | | | | | | | | Deprecated functions calling each other is not worthy of warning, as they will all be removed at the same time. Task-number: QTBUG-80040 Change-Id: I4c2b31474e3ee8168fd48796cf99ead266dffb37 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix deprecation warning about QString from character literalUlf Hermann2019-11-181-1/+1
| | | | | | Task-number: QTBUG-80040 Change-Id: I6dddf65582c15b8cb8e42de5dbcc38ebe8d5867a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* mouseDrag(): never drag along an axis that wasn't requestedMitch Curtis2019-11-142-2/+138
| | | | | | | | | | | mouseDrag() should not drag along an axis if the distance passed in for that axis was 0. Doing so can interfere with tests for an item that e.g. handles horizontal flicks which is within e.g. a Flickable that handles vertical flicks. This was seen with SwipeDelegate auto tests, where the delegates handles horizontal swipes within a vertical ListView. Change-Id: I8fee567d59c53bdc4cbfe1d42ae0592e324bd2f6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* QQmlTableInstanceModel: always emit index changed when an item is reusedRichard Moe Gustavsen2019-11-146-6/+60
| | | | | | | | | | | | | | | | | | | | | When reusing a delegate item, it can sometimes happen that the item ends up being reused at the same location in the table as it had before it was pooled. And in that case, we don't emit changes to index, row and column since they technically didn't change. The problem is that the model might have changed in-between, e.g if a row has been removed. And in that case, row and column will, even when unchanged, point to other parts of the model. So all bindings needs to be reevaluated to ensure that the values they use are refreshed. This patch will therefore ensure that we always emit changes to the mentioned properties when an item is reused, regardless if they change or not. Fixes: QTBUG-79209 Change-Id: Icec201a43a30b9f677303fbf652baf6487621deb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-149-55/+120
|\ | | | | | | Change-Id: I06578422b4558feabf7a77426b01e77953ab60e2
| * Fix a layout bug caused by a delegate item that was moved by the user5.13Jan Arve Sæther2019-11-123-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The position of the first item in the list of visualItems was used to know how to layout the rest of the visual items. However, this did not work if the first item was actually moved (e.g. due to a DnD operation). We therefore store the position of the first visual item after each time we arrange it, and use that as a basis on where to start layouting from. Task-number: QTBUG-78076 Change-Id: I837f5b7d61a13d98d23287685c6fd66817360906 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Doc: add section on imperative vs declarative to best practices pageMitch Curtis2019-11-111-0/+37
| | | | | | | | | | | | Change-Id: I6ea16474e5e59f76f7b2c5806e381a1a4b05db20 Fixes: QTBUG-79903 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * QQuickAccessibleAttached: keep track of name being explicitly setMitch Curtis2019-11-063-2/+50
| | | | | | | | | | | | | | | | | | This allows types to attach an accessible name to an item, so long as the user hasn't done so themselves. Task-number: QTBUG-66583 Change-Id: I04f26815ffeaf1198fee25dc414253de8b8dfabe Reviewed-by: Liang Qi <liang.qi@qt.io>
| * QQmlVMEMetaObject: Scope MemberData for allocating writeUlf Hermann2019-11-052-52/+21
| | | | | | | | | | | | | | | | | | | | If we need to allocate in order to write a property of the object, we need to make sure that the member data is not garbage collected during that allocation. Change-Id: I885cdc547588c1b20450e1586765cd0266b4c4f0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Qt Quick Layouts: Do not assert when specifying an invalid row/columnJan Arve Sæther2019-11-132-2/+49
| | | | | | | | | | | | | | | | We now print a warning and try to gracefully handle it Change-Id: I66e79fe918808f5fede78a23df50e9e95b7b832d Fixes: QTBUG-67204 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fuzzing: Don't copy input data to QByteArrayRobert Loehning2019-11-131-1/+1
| | | | | | | | | | Change-Id: I1c83b2da19f9d73e4069ecb1f85af71e2ac2b96b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix warning about non-relative paths in qmldir filesSimon Hausmann2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Permit the use of resource urls in qmldir files to allow for the use-case of a plugin including its .qml files in resources and optionally compiling them ahead of time. When the resources are bundled in the plugin, qmlplugindump might or might not work. Task-number: QTBUG-48809 Change-Id: Icb331c7575f26316b5c2bcc604b9c6d793977a9f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | autotest, tableview: silence compiler warningRichard Moe Gustavsen2019-11-121-1/+1
| | | | | | | | | | Change-Id: I311f0c21baa73521717ad98b2398d5469b9ac208 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTableView::forceLayout(): rebuild table if the size of the model has ↵Richard Moe Gustavsen2019-11-123-17/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed An assert will trigger if forceLayout() is called while the model is being reset. The reason is that the forceLayout() schedules a relayout which assumes that the size of the model hasn't changed. But while layouting, it will try to fetch data from the model according to the old size, which will trigger an assert. This patch will add an extra path to forceLayout() that checks if the size of the model has changed, and if so, schedule a complete rebuild instead of just a relayout. Fixes: QTBUG-79395 Change-Id: If61658912d9e90c1a5aef9bc28083da20fa6ec76 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | fix rendernode example buildLorn Potter2019-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | When not building developer mode, the install does not copy the files on other platforms Fixes: QTBUG-79781 Change-Id: Ibc8352c59d16b69618d53750511d5b5650ed5290 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Doc: Fix documentation warningsTopi Reinio2019-11-1127-56/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a lot of documentation warnings introduced by the separation of QtQml.Models and QtQml.WorkerScript modules from the QtQml documentation project into their own sub-projects. Fix the above, and also ensure that the experimental Qt.labs.qmlmodels QML types are listed in the documentation, and add them also on the QML module page for QtQml.Models. A few warnings remain, they may be indicative of issues not in the scope of this commit. Fixes: QTBUG-79812 Change-Id: Idc25c976e4c96feab4aae893519d6c9245f57a64 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | RuntimeHelpers: Short-circuit stringToNumber on huge stringsUlf Hermann2019-11-071-0/+9
| | | | | | | | | | | | | | | | | | We don't need to iterate such a monster, or even convert it to latin1. It won't be a valid number anyway. Fixes: QTBUG-78955 Change-Id: Iaa35d924511885f804abe2d5c74235adcad55b27 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | lancelot graphics test: Use application bundle on MacEirik Aavitsland2019-11-073-4/+15
| | | | | | | | | | | | | | | | | | | | Font handling has been observed to differ depending on the presence of the Info.plist file in the app bundle. We want to test the typical use case, so make the qmlscenegrabber executable be a bundled app. Change-Id: I2e8b96328b16d5bedfeb5f6dd23f20c06d4c60c1 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Blacklist tst_qquicktextedit::mouseSelectionMode on OpenSuse 15Ulf Hermann2019-11-071-0/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-78846 Change-Id: I74d0f35b5ee1d22b10564c28edeb833689bbc6d9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-041-1/+2
|\| | | | | | | Change-Id: I3647815e507f5d219ea742413372101c15579b8f
| * QQuickItem::setParentItem: Check for d->window after deref'ing itUlf Hermann2019-10-311-1/+2
| | | | | | | | | | | | | | | | The window may have been deleted. In that case there is nothing to do. Amends commit 73ad6e87bbeceea5830ab3a6b3dc66fa99e30f45. Change-Id: Ib591f34b51f58d49ed0b065be7025f8e54777c10 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-3118-29/+275
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/common/qv4compileddata_p.h src/qml/types/qqmlbind.cpp tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp Change-Id: I6a137907e63445f17a3d6181b832a6bd76135bb2
| * QQmlProperty: handle reads of QQmlPropertyMap correctlyFabian Kosmale2019-10-302-3/+30
| | | | | | | | | | | | Fixes: QTBUG-79614 Change-Id: Iaf84c0178dc88072a367da2b42b09554b85c7d57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QML Drag: Prevent crash when using image provider urlFabian Kosmale2019-10-302-1/+26
| | | | | | | | | | | | | | | | | | | | For attached property objects, qmlEngine will not return an engine. However, QQuickDragAttached's parent is the object to which it is attached, and from that one we can get the engine. Fixes: QTBUG-72045 Change-Id: I40748dd11ea3eb4604c37e932b2cfd3baad6fd1f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.13.2' into 5.13Qt Forward Merge Bot2019-10-295-2/+79
| |\ | | | | | | | | | Change-Id: I2b55bea338aa854d940a6da9b6703866209e6ba6
| | * Set the screen on the QOpenGLContext to be the same as the windowv5.13.2Andy Shaw2019-10-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that the QOpenGLContext has the right screen information and can create a compatible context for use with QQuickWidget. Change-Id: I9d78ff2b616e5c1d1c11d1da438ce336a0f24953 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * Handle null in QQuickPointerEvent and QQEventPoint debug operatorsShawn Rutledge2019-10-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | For example qDebug() << event->asMouseEvent() could crash if the event is not a mouse event. Change-Id: I34ffadeb9fc23f42d1d6939190c43a6486eea533 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * Add changes file for Qt 5.13.2Antti Kokko2019-10-171-0/+63
| | | | | | | | | | | | | | | | | | Change-Id: Ibfc31704442f9a911f37cdda3baa48e2ccb34c42 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I7345dd5dc9684c19e075d4d81c6a4df7421cae27
| | * Merge 5.13 into 5.13.2Frederik Gladhorn2019-10-1132-33/+494
| | |\ | | | | | | | | | | | | Change-Id: Ib1a7bdda1cde721efb356b2d043b26e2db7386ae
| | * | Doc: Add a \note about the (broken) Binding value restoration policyUlf Hermann2019-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78566 Change-Id: Ic76b6212f4ccc3ce8b9199166223e92c203272a5 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | QQuickItem::setParentItem: add child earlierFabian Kosmale2019-10-293-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling (de)refWindow can trigger QQuickItem::windowChanged, which in turn can call a user defined windowChanged handler. If that signal handler were to call setParentItem, we would encounter an inconsistent state: The item already has its parent set, but that parent would lack the item in its children list (as we would only call refWindow at a later point). Fixes: QTBUG-79573 Fixes: QTBUG-73439 Change-Id: I46adaa54a0521b5cd7f37810b3dd1a206e6a09c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | qv4compileddata: do not use raw constexprFabian Kosmale2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary after change 50481fb909c2bbbc26a193e23783e5b0151168b9 in qtbase Fixes: QTBUG-79563 Change-Id: I72c94cd87b881f2fb3fee005f73583f64cbf68e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Add missing emits from various property setters in {Grid,Row}LayoutJan Arve Sæther2019-10-252-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ac473b3d46ff1f898c1607deb6ad3d586753244 Fixes: QTBUG-79359 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Loader: Actually clear initial properties when changing sourceFabian Kosmale2019-10-244-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-79435 Change-Id: Ic99a3b1a9d64426a64117b90a3e11fe99af0d260 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Rename some variables and a function to improve clarityJan Arve Sæther2019-10-242-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename firstVisibleItem() to firstItemInView() to reflect its behavior, as the comment requested ;) * Likewise, rename some related variables Change-Id: I98e25d5d47a4acb56a2b4f2bd75bec062ff770ee Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | | Adapt test case to avoid null characters in directory namesUlf Hermann2019-10-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file system engine in QtCore is stricter now about these things. In the particular example we have here, the first character of the imported directory was a null character, which would previously lead to the whole import being ignored. We cannot do such nasty things anymore. Therefore, comment the import out, in order to retain the old behavior. Fixes: QTBUG-79562 Change-Id: I04917bf7db32e9d09e5919555740a263af2d1795 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | | | Add vulkanunderqml to the list of examplesLaszlo Agocs2019-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2e477ec29bf352876011adf0aa2cdcf456bd091 Fixes: QTBUG-79541 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Fix assertion with certain Text items when rendering with MetalLaszlo Agocs2019-10-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by a -1 vs. 0 discrepancy between the QRhi and the OpenGL glyph caches. width() and height() are expected to return 0 for an empty image, but this we forgot to honor in the QRhi version. That returned the width or height of a QSize, and those are -1 when default constructed. (there are good reasons for that, it just happens to not match the non-QSize-based code path here) Change-Id: Idda0d2f77430abea79d4004b765077032e06954b Fixes: QTBUG-79533 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Enhance Layer.smooth docsLaszlo Agocs2019-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to tell what the default value is. Change-Id: Icb361b8271f4d81390322f9ce94db6e04b530937 Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | qmllint: fix typoFabian Kosmale2019-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I02a6f4dd1804251e0420f2fbc334ee9c38d3dc49 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | Update flowchart to reflect addition of new methodsFabian Kosmale2019-10-242-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed reference to setContextProperty, as we want to deprecate them - Added qmlRegisterSingletonInstance as a different way to register a singleton and as a replacement for setContextProperty - Replaced no-argument qmlRegisterType with qmlRegisterAnonymousType - Restructured graph, removing a few choices Task-number: QTBUG-78952 Change-Id: I1882d3fdd281fd15ae9940127d078457f2942edb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 01:42:29 +0000