PKGBUILDs/qt5/android-aarch64/0002-Fix-androiddeployqt-se...

35 lines
1.6 KiB
Diff
Raw Normal View History

2019-09-06 23:45:08 +02:00
From 996c53a388705a0bbf778faaf7660efad98e1eff Mon Sep 17 00:00:00 2001
2018-12-08 22:06:32 +01:00
From: Martchus <martchus@gmx.net>
Date: Sun, 9 Dec 2018 14:31:30 +0100
2019-06-25 13:41:05 +02:00
Subject: [PATCH 2/4] Fix androiddeployqt search paths
2018-12-08 22:06:32 +01:00
---
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
2019-06-25 13:41:05 +02:00
index 01c392f8f9..9600d657cb 100644
2018-12-08 22:06:32 +01:00
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
2019-03-16 16:58:50 +01:00
@@ -1721,7 +1721,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"));
2019-04-21 22:37:50 +02:00
importPaths += shellQuote(rootPath);
for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
importPaths += shellQuote(qmlImportPath);
2019-06-25 13:41:05 +02:00
@@ -1857,7 +1857,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;
2018-12-08 22:06:32 +01:00
while (!remainingDependencies.isEmpty()) {
--
2019-09-06 23:45:08 +02:00
2.23.0
2018-12-08 22:06:32 +01:00