diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-04 13:52:18 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-15 16:56:10 +0200 |
| commit | 828cdcabf84734a753e3ba8b8e4b089a6e155415 (patch) | |
| tree | 0bad81fccdc270b28988dc4dc27d047f0354b8c7 /src/qml/qml/qqmlimport.cpp | |
| parent | f2378620e1616a7ec1b277b57da9176ccb7828ae (diff) | |
Remove QtQuick.Window plugin
We move all the types into QtQuick itself and retain QtQuick.Window only
as alias to QtQuick. This requires support for qmldirs that consist of
only an import statement.
[ChangeLog][QtQuick][Important Behavior Changes] The contents of the
QtQuick.Window QML module have been moved into the QtQuick module.
QtQuick.Window is merely and alias for QtQuick now. An explicit import
of QtQuick will override this alias. Therefore, if you import QtQuick
with a different version than QtQuick.Window, you will get the
QtQuick.Window types of the version given in the QtQuick import now.
Task-number: QTBUG-84639
Change-Id: Ia82afab0ac2faba70cfdaf53dc8dfe4261e1113f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 275c53cfda..a5429afd12 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1585,6 +1585,8 @@ bool QQmlImportsPrivate::addLibraryImport( // Ensure that we are actually providing something if (!QQmlMetaType::isModule(uri, version)) { if (inserted->qmlDirComponents.isEmpty() && inserted->qmlDirScripts.isEmpty()) { + if (qmldir.plugins().isEmpty() && !qmldir.imports().isEmpty()) + return true; // This is a pure redirection QQmlError error; if (QQmlMetaType::isAnyModule(uri)) { error.setDescription(QQmlImportDatabase::tr( |