1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- a/qtbase/src/tools/androiddeployqt/main.cpp 2018-12-03 08:15:26.000000000 -0300
+++ b/qtbase/src/tools/androiddeployqt/main.cpp 2018-12-11 13:52:56.700766773 -0300
@@ -1663,7 +1663,7 @@
rootPath += QLatin1Char('/');
QStringList importPaths;
- importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/qml"));
+ importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/lib/qt/qml"));
importPaths += rootPath;
for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
importPaths += shellQuote(qmlImportPath);
@@ -1758,7 +1758,7 @@
fprintf(stdout, " -- Appending dependency found by qmlimportscanner: %s\n", qPrintable(fileName.absolutePath));
// Put all imports in default import path in assets
- fileName.relativePath.prepend(QLatin1String("qml/"));
+ fileName.relativePath.prepend(QLatin1String("lib/qt/qml/"));
options->qtDependencies.append(fileName);
if (fileName.absolutePath.endsWith(QLatin1String(".so"))) {
@@ -1794,7 +1794,7 @@
return false;
// Jam in the dependencies of the platform plugin, since the application will crash without it
- if (!readDependenciesFromElf(options, options->qtInstallDirectory + QLatin1String("/plugins/platforms/android/libqtforandroid.so"), &usedDependencies, &remainingDependencies))
+ if (!readDependenciesFromElf(options, options->qtInstallDirectory + QLatin1String("/lib/qt/plugins/platforms/android/libqtforandroid.so"), &usedDependencies, &remainingDependencies))
return false;
while (!remainingDependencies.isEmpty()) {
|