From 19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 12 Jun 2012 20:23:47 +0200 Subject: Separate the path for Qt Quick 1 plugins from Qt Quick 2 Install and load Qt Quick 1 plugins from imports/QtQuick1/... This is to avoid conflicts between Qt Quick 1 and 2 and cleanly spearate the plugins for both. Currently, e.g. the folderlistmodel exists for both, and gets installed into the same location. Change-Id: I55331a5a02148eacc3c615436d77eb97bf0fbd72 Reviewed-by: Lars Knoll --- src/declarative/qml/qdeclarativeimport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 25e3b830..b147e1d9 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -720,7 +720,7 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath #ifndef QT_NO_SETTINGS - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); #if defined(Q_OS_SYMBIAN) // Append imports path for all available drives in Symbian -- cgit v1.2.3