diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
| commit | ec686af14f817cc51323cfb01186f036905789c3 (patch) | |
| tree | 29d229c8df8f37db56b9f6f5f3997bcd732689d4 /src/quickcontrols2/qquickstyle.cpp | |
| parent | 0425562e14e41b62dc7631c7c02768b8294454d0 (diff) | |
| parent | 090eab86b05478572485b3086c087a846fbae7fd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_combobox.qml
Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
Diffstat (limited to 'src/quickcontrols2/qquickstyle.cpp')
| -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; |