qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add QML_PLUGIN_PATH environment variable to plugin path 

Check for contents of environment variable QML_PLUGIN_PATH
and add them to Qml plugin path. In some cases it would be
preferable to add additional Qml plugin paths without having
to call QQmlEngine::addPluginPath() in the application code.
Qt Android apps have already been doing this with
QT_BUNDLED_LIBS_PATH, but the naming could be a bit misleading
outside bundled Android apps.
The option to provide these additional paths with environment
variables is already commonly used, e.g. for other Qt plugins
and Qml imports.

Change-Id: Id81bb4fc6caa3c9c3adfd73be6ea45be74c5d8c4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Tinja Paavoseppä 2022-02-09 14:26:47 +02:00 committed by Ulf Hermann
parent 0ba259b1e5
commit c27e32def2
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qml/qml/qqmlimport.cpp
View File

@ -1670,7 +1670,7 @@ void QQmlImports::setDesignerSupportRequired(bool b)
designerSupportRequired = b; designerSupportRequired = b;
} }
static QStringList parseEnvImportPath(const QString &envImportPath) static QStringList parseEnvPath(const QString &envImportPath)
{ {
if (QDir::listSeparator() == u':') { if (QDir::listSeparator() == u':') {
// Double colons are interpreted as separator + resource path. // Double colons are interpreted as separator + resource path.
@ -1710,7 +1710,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
auto addEnvImportPath = [this](const char *var) { auto addEnvImportPath = [this](const char *var) {
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) {
const QStringList paths = parseEnvImportPath(qEnvironmentVariable(var)); const QStringList paths = parseEnvPath(qEnvironmentVariable(var));
for (int ii = paths.count() - 1; ii >= 0; --ii) for (int ii = paths.count() - 1; ii >= 0; --ii)
addImportPath(paths.at(ii)); addImportPath(paths.at(ii));
} }
@ -1722,15 +1722,19 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
addImportPath(QStringLiteral("qrc:/qt-project.org/imports")); addImportPath(QStringLiteral("qrc:/qt-project.org/imports"));
addImportPath(QCoreApplication::applicationDirPath()); addImportPath(QCoreApplication::applicationDirPath());
auto addEnvPluginPath = [this](const char *var) {
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) {
const QStringList paths = parseEnvPath(qEnvironmentVariable(var));
for (int ii = paths.count() - 1; ii >= 0; --ii)
addPluginPath(paths.at(ii));
}
};
addEnvPluginPath("QML_PLUGIN_PATH");
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
addImportPath(QStringLiteral("qrc:/android_rcc_bundle/qml")); addImportPath(QStringLiteral("qrc:/android_rcc_bundle/qml"));
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_BUNDLED_LIBS_PATH"))) { addEnvPluginPath("QT_BUNDLED_LIBS_PATH");
const QString envImportPath = qEnvironmentVariable("QT_BUNDLED_LIBS_PATH");
QLatin1Char pathSep(':');
QStringList paths = envImportPath.split(pathSep, Qt::SkipEmptyParts);
for (int ii = paths.count() - 1; ii >= 0; --ii)
addPluginPath(paths.at(ii));
}
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)
// Add the main bundle's Resources/qml directory as an import path, so that QML modules are // Add the main bundle's Resources/qml directory as an import path, so that QML modules are
// found successfully when running the app from its build dir. // found successfully when running the app from its build dir.