diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-05-10 20:28:08 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-05-12 18:27:40 +0000 |
| commit | c3981f3002511bfbfd63d0e1cb30a1ff2c5b95f1 (patch) | |
| tree | 62d7b60ee0cc248f0725fbc2b3263d1cf40d1d8b /examples | |
| parent | 46436b9d6959f0d15c07c653884b66712ead901a (diff) | |
Examples: Fix app_and_lib on Android multi-arch
The lib.qbs was using the Product item and setting the type property to staticLibrary.
This resulted in not inheriting from the NativeBinary item which sets the multiplex/aggregate properties on the android platform.
Fixes: QBS-1545
Change-Id: I1448266dfb0ed94fdf114c110c10899bc1cf23d2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/app-and-lib/app/app.qbs | 3 | ||||
| -rw-r--r-- | examples/app-and-lib/lib/lib.qbs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/app-and-lib/app/app.qbs b/examples/app-and-lib/app/app.qbs index 26f9774af..e94391877 100644 --- a/examples/app-and-lib/app/app.qbs +++ b/examples/app-and-lib/app/app.qbs @@ -50,8 +50,7 @@ import qbs 1.0 -Product { - type: "application" +Application { consoleApplication: true files : [ "main.cpp" ] Depends { name: "cpp" } diff --git a/examples/app-and-lib/lib/lib.qbs b/examples/app-and-lib/lib/lib.qbs index 5c0098dae..66ec4eccd 100644 --- a/examples/app-and-lib/lib/lib.qbs +++ b/examples/app-and-lib/lib/lib.qbs @@ -50,8 +50,7 @@ import qbs 1.0 -Product { - type: "staticlibrary" +StaticLibrary { name: "mylib" files: [ "lib.cpp", |