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 | |
| 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>
| -rw-r--r-- | modules/qt_quick1.pri | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/imports/shaders/shaders.pro | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/modules/qt_quick1.pri b/modules/qt_quick1.pri index 49bf4e22..ac87630d 100644 --- a/modules/qt_quick1.pri +++ b/modules/qt_quick1.pri @@ -10,7 +10,7 @@ QT.quick1.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick1/$$QT.quick1.VERSI QT.quick1.sources = $$QT_MODULE_BASE/src/declarative QT.quick1.libs = $$QT_MODULE_LIB_BASE QT.quick1.plugins = $$QT_MODULE_PLUGIN_BASE -QT.quick1.imports = $$QT_MODULE_IMPORT_BASE +QT.quick1.imports = $$QT_MODULE_IMPORT_BASE/QtQuick1 QT.quick1.depends = gui network script xmlpatterns QT.quick1.DEFINES = QT_QTQUICK1_LIB 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 diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index d7a8884b..6b9bf1d6 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,5 +1,5 @@ TARGET = qmlfolderlistmodelplugin -TARGETPATH = Qt/labs/folderlistmodel +TARGETPATH = QtQuick1/Qt/labs/folderlistmodel include(../qimportbase.pri) QT += widgets quick1 script diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index f1ea07a4..d382d0f1 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -1,5 +1,5 @@ TARGET = qmlgesturesplugin -TARGETPATH = Qt/labs/gestures +TARGETPATH = QtQuick1/Qt/labs/gestures include(../qimportbase.pri) QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 45af41ad..f249a069 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,5 +1,5 @@ TARGET = qmlparticlesplugin -TARGETPATH = Qt/labs/particles +TARGETPATH = QtQuick1/Qt/labs/particles include(../qimportbase.pri) QT += quick1 quick1-private core-private gui-private widgets-private diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index 7572aac4..5fe70d6c 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -1,5 +1,5 @@ TARGET = qmlshadersplugin -TARGETPATH = Qt/labs/shaders +TARGETPATH = QtQuick1/Qt/labs/shaders include(../qimportbase.pri) QT += quick1 widgets opengl |