diff options
| author | David Edmundson <davidedmundson@kde.org> | 2020-01-28 15:11:55 +0000 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-01-29 09:31:05 +0000 |
| commit | 33474ce5f16f418a8f132ba88b8cbd5b5d1edcca (patch) | |
| tree | 022d63d3ae2746616e51e77306d408edfd121270 /src/quickcontrols2/qquickstyle.cpp | |
| parent | c5c945006244b6bf5189f1949a009f70ebd51d7a (diff) | |
Follow QML2_IMPORT_PATH in path search
When searching for styles we include QLibraryInfo::Qml2ImportsPath so it
makes sense to continue that to also include the runtime
QML2_IMPORT_PATH when searching for QQC2 themes.
It used to be included, but in 5.14 this behavior changed as a result of
7db4df2deca52a30b4c068abd4683a1720cf281e, so this line is restored.
Change-Id: I185b29b323d870fc724e655104eaf42034707738
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickstyle.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 707e4730..61632b11 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -128,6 +128,7 @@ static QStringList defaultImportPathList() importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); # endif #endif + importPaths += envPathList("QML2_IMPORT_PATH"); importPaths += QStringLiteral(":/qt-project.org/imports"); importPaths += QCoreApplication::applicationDirPath(); return importPaths; |