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.

Pick-to: 6.1
Fixes: QTBUG-92245
Change-Id: Idb81a5d02bae9ca3254e7590140a128500572b07
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-04-06 15:19:20 +02:00
parent d0c2425d79
commit 20db8dbeeb

View File

@ -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<QString> *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)