diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-04 15:07:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-08-04 14:56:46 +0000 |
| commit | 410ba29770614457e0d5d6b45d782967d6849b3c (patch) | |
| tree | a78b34d3919d74a2ebf2a4e2ff27ef96213f2dd7 | |
| parent | 1e713049134f1826c69ac14a97c9a602c24f3399 (diff) | |
| download | qbs-410ba29770614457e0d5d6b45d782967d6849b3c.tar.gz | |
Android: Do not append the version number to a library name
Only the ".so" suffix is supported on Android.
Fixes: QBS-1578
Change-Id: Idebece5338a765e779ff987fd89af66977ecc0fe
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata-android/teapot/teapot.qbs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index f218a4991..bd58cbcca 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -74,6 +74,7 @@ LinuxGCC { property string toolchainTriple: [targetAbi === "androideabi" ? "arm" : targetArch, targetSystem, targetAbi].join("-") + internalVersion: undefined toolchainPrefix: undefined machineType: { diff --git a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs index 2b5cb8aba..30cfbb820 100644 --- a/tests/auto/blackbox/testdata-android/teapot/teapot.qbs +++ b/tests/auto/blackbox/testdata-android/teapot/teapot.qbs @@ -133,6 +133,7 @@ Project { FileTagger { patterns: ["*.inl"]; fileTags: ["hpp"] } + version: "2.0" Android.sdk.apkBaseName: name Android.sdk.packageName: "com.sample.teapot" Android.sdk.sourceSetDir: teapotProbe.dir |