diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-03-09 15:24:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-17 20:06:16 +0000 |
| commit | 9333ea8649838d7e0400b0e94c8cbd4fa5d216b0 (patch) | |
| tree | 08a750b6afa315ac16ea855a87a1d1d18afe30e3 /src/qml/qml/qqmlimport_p.h | |
| parent | 6b77f0eb99a33b46000ac66ec297082527009d5d (diff) | |
Ensure we read context properties before the global object
Also global variables declared in a .pragma library script
should not be saved in the global object, as the script has
it's on context where those variables live.
[ChangeLog][QtQml] Properties of the JS global object will now
be looked up after local properties in the QML object. This
can lead to runtime incompatibilities if your qml file is named
the same as a property of the global object (e.g. Date.qml).
Task-number: QTBUG-51581
Change-Id: I108aea4c76d088ca8c2124700f91e8eac3fc19f3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index 2437979ef8..283bd40660 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -94,7 +94,8 @@ struct QQmlImportInstance int *vmajor, int *vminor, QQmlType* type_return, QString *base = nullptr, bool *typeRecursionDetected = nullptr, QQmlType::RegistrationType = QQmlType::AnyRegistrationType, - QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const; + QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion, + QList<QQmlError> *errors = nullptr) const; }; class QQmlImportNamespace |