diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 09:44:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 09:44:10 +0200 |
| commit | caf123a28805f6de1de3144ea496712543b878cd (patch) | |
| tree | 9eae94d6bee228c62c942c37296f96a91349c4c9 /src/tools | |
| parent | bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff) | |
| parent | d2894d968d50619c894e06b1e9f8b0f52e434222 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib6649a412e131bf679aab97c4c384520af348b4f
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 6cc9f6102c..705a9904b4 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -318,8 +318,10 @@ static QString shellQuote(const QString &arg) QString architecureFromName(const QString &name) { + const QFileInfo fi(name); + const QString extractedFileName = fi.fileName(); QRegExp architecture(QStringLiteral(".*_(.*)\\.so")); - if (!architecture.exactMatch(name)) + if (!architecture.exactMatch(extractedFileName)) return {}; return architecture.capturedTexts().last(); } |