diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-12 20:23:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 20:29:37 +0200 |
commit | 19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 (patch) | |
tree | 0eac59ad10eb5c5063489b7d650ebfdaefb2a33e /src/declarative/qml/qdeclarativeimport.cpp | |
parent | 7ce30f9e366a120bc4e69674fba0ab5d0a65ca6f (diff) |
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 <lars.knoll@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |