diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-15 14:01:59 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-19 17:38:19 +0100 |
| commit | 7cdd8ce8bd4c68b21e7953a1e4101986f27461f9 (patch) | |
| tree | b685cc6a4e8fe64adcbbf491c628bda895d9cbd0 /src/qml/qml/qqmlengine.cpp | |
| parent | 0c74cbcccb52e296667c6bc171084f4946daef61 (diff) | |
Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.
Also change the environment variable to be QML2_IMPORT_PATH. This
splits the imports from QML 1 (the QtDeclarative library).
Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index b4962a6b1d..f0bf6e4e20 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1670,8 +1670,8 @@ void QQmlEngine::addImportPath(const QString& path) type version mapping and possibly QML extensions plugins. By default, the list contains the directory of the application executable, - paths specified in the \c QML_IMPORT_PATH environment variable, - and the builtin \c ImportsPath from QLibraryInfo. + paths specified in the \c QML2_IMPORT_PATH environment variable, + and the builtin \c Qml2ImportsPath from QLibraryInfo. \sa addImportPath(), setImportPathList() */ @@ -1686,8 +1686,8 @@ QStringList QQmlEngine::importPathList() const installed modules in a URL-based directory structure. By default, the list contains the directory of the application executable, - paths specified in the \c QML_IMPORT_PATH environment variable, - and the builtin \c ImportsPath from QLibraryInfo. + paths specified in the \c QML2_IMPORT_PATH environment variable, + and the builtin \c Qml2ImportsPath from QLibraryInfo. \sa importPathList(), addImportPath() */ |