Fixed androiddeployqt search paths.

1 files changed, 20 insertions, 0 deletions

diff --git a/0003-Fix-androiddeployqt-search-paths.patch b/0003-Fix-androiddeployqt-search-paths.patch
new file mode 100644
index 000000000000..cf37f39ae6ab
--- /dev/null
+++ b/0003-Fix-androiddeployqt-search-paths.patch
@@ -0,0 +1,20 @@
+--- a/qtbase/src/tools/androiddeployqt/main.cpp	2018-09-13 01:25:10.000000000 -0300
++++ b/qtbase/src/tools/androiddeployqt/main.cpp	2018-11-28 11:01:22.654317806 -0300
+@@ -1629,7 +1629,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);
+@@ -1760,7 +1760,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;
+ 
+     QString qtDir = options->qtInstallDirectory + QLatin1Char('/');