Include the Android specific path for the imports

androiddeployqt will put all the files originally in the assets into a
rcc file now instead of having them copied over as before. Therefore the
styles need to be searched for in that path to see if they exist.

Fixes: QTBUG-79952
Change-Id: Ief8fc59257d3b329dd8b5b28190433e1b1a7f12d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Andy Shaw 2019-11-15 14:50:46 +01:00
parent 9c05807b95
commit 7db4df2dec
1 changed files with 7 additions and 2 deletions

View File

@ -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;