diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-06 15:19:20 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-07 10:21:52 +0200 |
| commit | 20db8dbeeb808edce683e34de10498ee2cdda0fc (patch) | |
| tree | 50e655e4d62b292e12e2d14a6f5ef60e8da9dc0c /src/tools/androiddeployqt | |
| parent | d0c2425d791edd75e35cce65ddbcfaab9a7f16ed (diff) | |
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>
Diffstat (limited to 'src/tools/androiddeployqt')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index c7b85071b0..2d660ff844 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<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) |