From 828cdcabf84734a753e3ba8b8e4b089a6e155415 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 4 Jun 2020 13:52:18 +0200 Subject: 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 --- src/qml/qml/qqmlimport.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qml') 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( -- cgit v1.2.3