diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-06 15:19:20 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-07 14:02:36 +0000 |
| commit | 66598931d8107acb2d8cf6f2034aa38bbd9ee7bc (patch) | |
| tree | f822b06806ce288ddbbedd2664e9c2677da5cf87 | |
| parent | 104c7ff6490b932df72f2244df42666d72860dd2 (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.
Fixes: QTBUG-92245
Change-Id: Idb81a5d02bae9ca3254e7590140a128500572b07
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 20db8dbeeb808edce683e34de10498ee2cdda0fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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) |