Martchus
8bcbcdde52
Further versions broke the build system,
see 18443d861e.
With 5.15.1 it basically works again but deployment with androiddeployqt
does not produce runnable APKs. Qt now has gained support for invoking
androiddeployqt within CMake. Using their official support instead of my
own helper might have worked but it could not cope with the fact that I
had multiple targets in my CMake project and was therefore useless in my
case.
So let's ditch Qt 5 on Android and give Qt 6 another chance at some
point.
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From 996c53a388705a0bbf778faaf7660efad98e1eff Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 9 Dec 2018 14:31:30 +0100
|
|
Subject: [PATCH 2/4] 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 01c392f8f9..9600d657cb 100644
|
|
--- a/src/tools/androiddeployqt/main.cpp
|
|
+++ b/src/tools/androiddeployqt/main.cpp
|
|
@@ -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"));
|
|
importPaths += shellQuote(rootPath);
|
|
for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
|
|
importPaths += shellQuote(qmlImportPath);
|
|
@@ -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;
|
|
|
|
while (!remainingDependencies.isEmpty()) {
|
|
--
|
|
2.23.0
|
|
|