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/qqmlengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlengine.cpp') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 8f2c554a7e..f8469cce14 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1999,7 +1999,7 @@ void QQmlEngine::setPluginPathList(const QStringList &paths) bool QQmlEngine::importPlugin(const QString &filePath, const QString &uri, QList *errors) { Q_D(QQmlEngine); - return d->importDatabase.importDynamicPlugin(filePath, uri, QString(), errors); + return d->importDatabase.importDynamicPlugin(filePath, uri, QString(), -1, errors); } /*! -- cgit v1.2.3