diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-08 01:02:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-08 01:02:11 +0100 |
| commit | 92f2447cf3850303f161271c049a5b8d0a55b9f5 (patch) | |
| tree | dd12533ea6b2883bbe40b1b359e379dfe8f8dfe7 /tests/auto/qml/qqmllanguage | |
| parent | 1aae51242ed3902efac9524360f678113087f159 (diff) | |
| parent | e04e5db13d2a1d03e4afe139fcc29e0ed5b1edab (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I92e477524c95cceed61882e494e478eb1f8991ce
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt index 810fd31b41..d76f18ba89 100644 --- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt @@ -1 +1 @@ -5:5:Invalid grouped property access +5:5:Invalid grouped property access: Property "o" with type "QVariant", which is not a value type diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt index f6d6f29fbf..9a0422753f 100644 --- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt @@ -1 +1 @@ -4:5:Invalid grouped property access +4:5:Invalid grouped property access: Property "customType" with type "MyCustomVariantType", which is not a value type |