From 66598931d8107acb2d8cf6f2034aa38bbd9ee7bc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 6 Apr 2021 15:19:20 +0200 Subject: [PATCH] androiddeployqt: Fix the fallback location of rcc Now, that rcc lives in libexec, we need to assume the location of rcc to be "bin" on Windows and "libexec" elsewhere. Fixes: QTBUG-92245 Change-Id: Idb81a5d02bae9ca3254e7590140a128500572b07 Reviewed-by: Alexandru Croitor (cherry picked from commit 20db8dbeeb808edce683e34de10498ee2cdda0fc) Reviewed-by: Qt Cherry-pick Bot --- src/tools/androiddeployqt/main.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index c7b85071b04..2d660ff8445 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1785,6 +1785,15 @@ bool readDependenciesFromElf(Options *options, return true; } +QString defaultLibexecDir() +{ +#ifdef Q_OS_WIN32 + return QStringLiteral("bin"); +#else + return QStringLiteral("libexec"); +#endif +} + bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies); bool scanImports(Options *options, QSet *usedDependencies) @@ -1985,7 +1994,8 @@ bool createRcc(const Options &options) if (!options.rccBinaryPath.isEmpty()) { rcc = options.rccBinaryPath; } else { - rcc = options.qtInstallDirectory + QLatin1String("/bin/rcc"); + rcc = options.qtInstallDirectory + QLatin1Char('/') + defaultLibexecDir() + + QLatin1String("/rcc"); } #if defined(Q_OS_WIN32)