From 5cb8ca29c3815405d41d035f5f4ebb2af326a8ef Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 7 Jan 2015 15:19:29 +0100 Subject: Allow importing protected modules with different major versions This allows QtQuick.Controls 1.x and 2.x imports to co-exist even if they are two different plugins with the same module directive. Change-Id: Idee302439e3c2fd6813ba2f41b69144fbae7902c Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlmetatype_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlmetatype_p.h') diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index ac408836fa..2fcd113183 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -114,7 +114,7 @@ public: static const QQmlPrivate::CachedQmlUnit *findCachedCompilationUnit(const QUrl &uri); - static bool namespaceContainsRegistrations(const QString &); + static bool namespaceContainsRegistrations(const QString &, int majorVersion); static void protectNamespace(const QString &); -- cgit v1.2.3