diff options
author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-09-06 15:18:51 +0200 |
---|---|---|
committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-09-21 11:04:36 +0000 |
commit | 36b345c8cdd6a3c471a871ef184936b56674e696 (patch) | |
tree | a0cf12eda9ec4fd26c244145a3417f4df3d37783 /tests/auto/blackbox/testdata-android | |
parent | 95edba5453896ff66028bb06d1c3a5778f057645 (diff) |
Android: Change the product property to importingProduct to allow exporting Qt module
The product variable in the Export item refers to the exporting item.
If a qbs property is changed (example: qbs.architecture for the multiplexing
in Android) then the Depend failed because the qbs module was not loaded yet for
the exporting item.
Fixes: QBS-1576
Change-Id: I220c47b3094727fe169d3dccd244ab2785a782b7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-android')
-rw-r--r-- | tests/auto/blackbox/testdata-android/qt-app/main.cpp | 10 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs | 18 |
2 files changed, 28 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-android/qt-app/main.cpp b/tests/auto/blackbox/testdata-android/qt-app/main.cpp new file mode 100644 index 000000000..6278e2924 --- /dev/null +++ b/tests/auto/blackbox/testdata-android/qt-app/main.cpp @@ -0,0 +1,10 @@ +#include <QMainWindow> +#include <QApplication> + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + QMainWindow w; + w.show(); + return 0; +} diff --git a/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs b/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs new file mode 100644 index 000000000..ceeda2dc3 --- /dev/null +++ b/tests/auto/blackbox/testdata-android/qt-app/qt-app.qbs @@ -0,0 +1,18 @@ +Project { + QtGuiApplication { + Depends { name: "Lib" } + files: "main.cpp" + Android.sdk.packageName: "my.qtapp" + Android.sdk.apkBaseName: name + Depends { name: "Qt"; submodules: ["core", "widgets"] } + } + + StaticLibrary { + name: "Lib" + Export { + Depends { + name: "Qt.android_support"; + } + } + } +} |