diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2020-07-11 17:39:14 +0300 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2020-07-21 14:33:24 +0000 |
| commit | 072837660d43b0f83fa9ae405a4c36c0f3aa4519 (patch) | |
| tree | 172d4292106ac4fc520d99809e6bf25c15e67f2d | |
| parent | f00c3b009f9dc6a50006f4e4811683f19e764763 (diff) | |
Android: Do not fail if project contains multiple shared libraries
Do not fail the detection of the main binary if the first two candidates
do not match the product name. Simplify the logic to exclude all
non-matching candidates except the first one.
Change-Id: I5046d7e103a9130c602aa8991bb9853c6ff593dd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 2835a9336..410b05ff9 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -102,9 +102,8 @@ Module { targetArchitecture = theBinary.Android.ndk.abi; continue; } - if (theBinary.product.name === product.name - && candidate.product.name !== product.name) { - continue; // We already have a better match. + if (candidate.product.name !== product.name) { + continue; // This is not going to be a match } if (candidate.product.name === product.name && theBinary.product.name !== product.name) { |