diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml index d7c2153a93cd04ceb45064e7f5874a412432337f..6538c75d0e7caec151a3f311d7ccdb50e02aaf30 100644 --- a/cicd/gitlab-ci.yml +++ b/cicd/gitlab-ci.yml @@ -2,7 +2,7 @@ variables: QDS_CI_QT_VERSION: "6.8.0" QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts" QDS_CI_ANDROID_SDK_VERSION: "34.0.0" - QDS_CI_SKIP_TESTS: "true" + QDS_CI_SKIP_TESTS: "false" DEBIAN_FRONTEND: non-interactive GIT_SUBMODULE_STRATEGY: recursive diff --git a/cicd/stages/test.yml b/cicd/stages/test.yml index b6f63a49c8d51f0364139c8d2bc8145527592316..6eb7339800f757a9f5c41925bc9bb6714b1b68b8 100644 --- a/cicd/stages/test.yml +++ b/cicd/stages/test.yml @@ -27,6 +27,7 @@ test-x86_64: - cd ${QDS_CI_ARTIFACTS_PATH}/x86_64/test || exit 1 - mkdir -p ${QDS_CI_JOB_TEST_RESULTS_PATH} - adb install -r -g android-build-release.apk + - adb shell pm clear io.qt.qtdesignviewer.test - adb shell "run-as io.qt.qtdesignviewer.test rm -rf /data/data/io.qt.qtdesignviewer.test/files/output.junitxml" - adb shell am start -e applicationArguments "'-o output.junitxml,junitxml'" -n io.qt.qtdesignviewer.test/org.qtproject.qt.android.bindings.QtActivity - | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 21e6ee6f15508283d0c0033c2814910a567d5f77..cf9b341cd1830da22110e391ca3e5ee4c8ae52c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -76,13 +76,11 @@ target_include_directories(qtuiviewerlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -set_property(TARGET qtuiviewerlib - APPEND PROPERTY QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer" -) - set_target_properties(${PROJECT_NAME} PROPERTIES QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer") set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android +) +set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${ANDROID_OPENSSL_PATH}/libcrypto_3.so ${ANDROID_OPENSSL_PATH}/libssl_3.so diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index af81f228a30bb8afc6814a3146a45e6285571078..5c840f42ec52fd632dfd1a2e44302d27e6681ada 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,6 +19,8 @@ target_link_libraries( set_target_properties(${TARGET_NAME} PROPERTIES QT_ANDROID_PACKAGE_NAME "io.qt.qtdesignviewer.test") set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android +) +set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${ANDROID_OPENSSL_PATH}/libcrypto_3.so ${ANDROID_OPENSSL_PATH}/libssl_3.so