35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From bbb3a15a58bb3d8071b39b4e1a4b20c04f0cf9d1 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 9 Dec 2018 14:31:30 +0100
|
|
Subject: [PATCH 2/2] Fix androiddeployqt search paths
|
|
|
|
---
|
|
src/tools/androiddeployqt/main.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
|
|
index 11213872f3..5d8866076a 100644
|
|
--- a/src/tools/androiddeployqt/main.cpp
|
|
+++ b/src/tools/androiddeployqt/main.cpp
|
|
@@ -1663,7 +1663,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
|
|
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);
|
|
@@ -1794,7 +1794,7 @@ bool readDependencies(Options *options)
|
|
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()) {
|
|
--
|
|
2.19.2
|
|
|