Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos-mirror/qtdeclarative
base: af7aae4da57fc35c444ce82e682638d837eb582c
Choose a base ref
...
head repository: sailfishos-mirror/qtdeclarative
compare: 8635e5b300298c01ada7dc51bfca76c3f02bfc14
Choose a head ref
  • 9 commits
  • 55 files changed
  • 3 contributors

Commits on Jun 30, 2021

  1. Fix QuickTest module 

    It should be available under version 6.0 and we don't need to specify
all the details.

Pick-to: 6.2
Change-Id: Ic8756d3dc55188693068028d033bc2d13416d885
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    bf17318 View commit details
    Browse the repository at this point in the history

  2. qmlcompiler: Port type inference code from qmlcachegenplus 

    Move the type inference code so qmllint can benefit from the improved type analysis.

Change-Id: I00b2fad8334ec19fb33a45b3ceec9d6c49d12e93
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    @magoldst-qt
    magoldst-qt committed Jun 30, 2021
    Copy the full SHA
    3308e56 View commit details
    Browse the repository at this point in the history

  3. QtQml: Key plugins by URI where possible 

    This allows us to associate different qmldir files for the same module
with one another. Typically there is one qmldir file in the resource
file system and one in the QML import path. We cannot load plugins for
the latter, but usually we have already loaded any plugins we need. Now
we can detect this.

This requires us to construct a proper URI for implicit imports. The
easiest way to do this is to just use the URI from the qmldir if
available.

Modules with versions encoded in their paths and modules with multiple
plugins cannot be resolved by URI only. These continue to be keyed by
path. However, as we do not generate such modules, we will not
automatically get two instances of those, and we won't have to fall back
from one to the other.

Pick-to: 6.2
Change-Id: Ic79add936d263a8e559fd998fca15a6ae160952e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    bae18ec View commit details
    Browse the repository at this point in the history

  4. Add a "type" property to Signal in qmltypes 

    Signals can have return types. It's a bad idea, but possible.

Change-Id: I296b9511bad1eb739ff54a2a7100d360d08ada6b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    6616008 View commit details
    Browse the repository at this point in the history

  5. QQuickItemPrivate: Make {width,height}Valid a function 

    There is now some additional logic, so we cannot simply rely on the
boolean flag.

Task-number: QTBUG-94703
Pick-to: 6.2
Change-Id: Id4674efd205a58b015a82b3c06e63c8a031f6607
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
    @Inkane
    Inkane committed Jun 30, 2021
    Copy the full SHA
    f3452af View commit details
    Browse the repository at this point in the history

  6. QQuickItem::{width,height}Valid: correctly handle binding being undef… 

    …ined

The width/height is valid if we have a binding, unless the binding'
value is actually undefined. In that case, the width/height has been
reset. We still need to keep the binding, as it might change to a
defined state. Thus we need to explicitly check in the undefined case
whether the binding might be undefined.

Pick-to: 6.2
Fixes: QTBUG-94703
Change-Id: I0fd4ac608fdf4eeab09bb2c092045ef803233adc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
    @Inkane
    Inkane committed Jun 30, 2021
    Copy the full SHA
    e67b6c3 View commit details
    Browse the repository at this point in the history

  7. QmlCompiler: Add methods to get effective default|parent property 

    We need to traverse the base type hierarchy for this. Use those methods
where we previously did half-baked attempts to do so.

Change-Id: I8ed86401055ec1d75067c2bf2d5362c9d309c43a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    77638d4 View commit details
    Browse the repository at this point in the history

  8. qqmlmetatype.cpp: Fix indentation 

    Change-Id: I842a76f86d5a1dc7bf054dda328675028b289980
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    88e2b63 View commit details
    Browse the repository at this point in the history

  9. Use QV4::Scope::hasException() where applicable 

    It is shorter and encapsulates the exception handling a bit.

Change-Id: I8e2dc0eb3b930e222b8cb4852b73d99ca18a0379
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
    Ulf Hermann committed Jun 30, 2021
    Copy the full SHA
    8635e5b View commit details
    Browse the repository at this point in the history