diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-10-22 01:31:54 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-10-22 07:57:32 +0000 |
| commit | 6d6fe0c5ef3631f5538782ff153bd96531459c36 (patch) | |
| tree | a1fe27df411e5e83c6b429ed5523f8ce755ccf27 | |
| parent | 2f5f049ecf777bcfcbfe4a17af72768248f73eab (diff) | |
Android: Fix Qt 5.14 (and 5.15)
Amends 2f5f049e.
Change-Id: Ifa77899b3f5b206c1436f6ad6baea4c4d7a238ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 11fdf787e..bfdf916ba 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -489,10 +489,11 @@ void TestBlackboxAndroid::android_data() "lib/${ARCH}/libQt5QmlModels_${ARCH}.so", "lib/${ARCH}/libQt5QmlWorkerScript_${ARCH}.so", "lib/${ARCH}/libqmlapp_${ARCH}.so"}, generateAab); + if (version < qbs::Version(5, 15)) + expectedFile << expandArchs(ndkArchsForQt, { + "lib/${ARCH}/libQt5QuickParticles_${ARCH}.so"}, generateAab); if (version >= qbs::Version(5, 15)) expectedFile << expandArchs(ndkArchsForQt, { - "lib/${ARCH}/libQt5RemoteObjects_${ARCH}.so", - "lib/${ARCH}/libqml_QtQml_RemoteObjects_qtqmlremoteobjects_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_StateMachine_qtqmlstatemachine_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_WorkerScript.2_workerscriptplugin_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_Models.2_modelsplugin_${ARCH}.so", @@ -601,10 +602,11 @@ void TestBlackboxAndroid::android_data() "lib/${ARCH}/libQt5QmlModels_${ARCH}.so", "lib/${ARCH}/libQt5QmlWorkerScript_${ARCH}.so", "lib/${ARCH}/libqmlapp_${ARCH}.so"}, generateAab); + if (version < qbs::Version(5, 15)) + expectedFile << expandArchs(ndkArchsForQt, { + "lib/${ARCH}/libQt5QuickParticles_${ARCH}.so"}, generateAab); if (version >= qbs::Version(5, 15)) expectedFile << expandArchs(ndkArchsForQt, { - "lib/${ARCH}/libQt5RemoteObjects_${ARCH}.so", - "lib/${ARCH}/libqml_QtQml_RemoteObjects_qtqmlremoteobjects_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_StateMachine_qtqmlstatemachine_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_WorkerScript.2_workerscriptplugin_${ARCH}.so", "lib/${ARCH}/libqml_QtQml_Models.2_modelsplugin_${ARCH}.so", |