aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qmlcppcodegen/data/ambiguous.h
Commit message (Collapse)AuthorAgeFilesLines
* Correct license for test filesLucie Gérard2024-02-271-1/+1
| | | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-111-27/+2
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QmlCompiler: Fix licenses in test filesUlf Hermann2022-04-281-0/+28
| | | | | | | Those are not commercial-only anymore. Change-Id: I4ebb6fa4b8295b9e5cbb901ab39e30df6e0c85ce Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlCompiler: Improve ambiguous type detectionUlf Hermann2022-04-011-0/+20
When detecting an ambiguous type, we need to invalidate the entry in the list of types, rather than delete it. If we delete it and we get yet another version of the type, we'll add that one just like it was not ambiguous. Furthermore, we cannot check the type name when looking for ambiguity. The QML name can be bent and twisted in various ways, to import ambiguous-looking types under different names, so that they are actually not ambiguous. Pick-to: 6.2 6.3 Fixes: QTBUG-102153 Change-Id: Iee7951229c5f68b168899e55164e8cf91587eec1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>