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/qqmlimport.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/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 0b07705cec..7a2f4eaf34 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1320,13 +1320,13 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) { filePluginPath << QLatin1String("."); - // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath + // Search order is applicationDirPath(), $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); addImportPath(installImportsPath); // env import paths - QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); if (!envImportPath.isEmpty()) { #if defined(Q_OS_WIN) QLatin1Char pathSep(';'); |