diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:47 +0100 |
| commit | e5d4a5828b67ab9dbad57d5d47f535b2b0841d92 (patch) | |
| tree | c54b144ea5a04f66f91aaa5f1c161fecef670354 /src | |
| parent | c23697e40881491ea218898bec08fb33dd7f5331 (diff) | |
| parent | 0d2fc12b65028b4f04bdace3991448813130ab48 (diff) | |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I94abb1fefa2943d363634a78be9523278c497256
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 408a0de3..7a3359ef 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -119,10 +119,15 @@ static QStringList defaultImportPathList() { QStringList importPaths; importPaths.reserve(3); -#ifndef QT_STATIC +#ifdef Q_OS_ANDROID + // androiddeployqt puts the QML files inside a resource file and they are not + // showing up in the Qml2ImportsPath as a result + importPaths += QStringLiteral(":/android_rcc_bundle/qml"); +#else +# ifndef QT_STATIC importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); +# endif #endif - importPaths += envPathList("QML2_IMPORT_PATH"); importPaths += QStringLiteral(":/qt-project.org/imports"); importPaths += QCoreApplication::applicationDirPath(); return importPaths; |