diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2025-04-11 15:02:44 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2025-04-11 15:50:24 +0200 |
| commit | a5dc4453d67ead009c656f0752ddaa534e406d52 (patch) | |
| tree | 30e1993d7bbf5c163633b48afd9e90d949f515cf | |
| parent | 3fcd01413fc661e252c1743cc791b1bf565be957 (diff) | |
DOM: Load QML/plugins.qmltypes intead of builtins.qmltypes
This is still wrong (not all of them should be available), but at least
it avoids warnings about types being defined multiple times (as
QML/plugins.qmltypes will be loaded by anything using Qml), whereas
builtins.qmltypes is not considered by anything else.
A proper fix is still needed.
Task-number: QTBUG-135918
Change-Id: I4775e887f39f25df93159131d67338dab2c31759
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qmldom/qqmldomtop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmldom/qqmldomtop.cpp b/src/qmldom/qqmldomtop.cpp index ba830425b8..909531118b 100644 --- a/src/qmldom/qqmldomtop.cpp +++ b/src/qmldom/qqmldomtop.cpp @@ -1380,7 +1380,7 @@ void DomEnvironment::loadModuleDependency(const DomItem &self, const QString &ur void DomEnvironment::loadBuiltins(const Callback &callback, const ErrorHandler &h) { - QString builtinsName = QLatin1String("builtins.qmltypes"); + QString builtinsName = QLatin1String("QML/plugins.qmltypes"); const auto lPaths = loadPaths(); for (const QString &path : lPaths) { QDir dir(path); @@ -1391,7 +1391,7 @@ void DomEnvironment::loadBuiltins(const Callback &callback, const ErrorHandler & return; } } - myErrors().error(tr("Could not find builtins.qmltypes file")).handle(h); + myErrors().error(tr("Could not find the QML/plugins.qmltypes file")).handle(h); } void DomEnvironment::removePath(const QString &path) |