From 88cb10c41ce7c6a00487e9f3b1993dcf9aecd640 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 18 Feb 2021 13:29:00 +0200 Subject: Coin: remove workarounds to allow running Android tests We had two workarounds: * script that adds Gui to tests * create a symbolic link for the qt install dir to fake_prefix which androiddelployqt was expecting them to be under Both issues are fixed, thus removing the workarounds. Change-Id: Ic022bece15afe92c693d573893d260b13b4227ed Reviewed-by: Heikki Halmet (cherry picked from commit bcbdbd50fefd90cc8cfe2c01d8f681dfe690971a) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtWrapperScriptHelpers.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmake') diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake index 3f8fbca54f..15b0ca9eca 100644 --- a/cmake/QtWrapperScriptHelpers.cmake +++ b/cmake/QtWrapperScriptHelpers.cmake @@ -162,6 +162,4 @@ function(qt_internal_install_android_helper_scripts) qt_path_join(destination "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}") qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_emulator_launcher.sh" DESTINATION "${destination}") - qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_cmakelist_patcher.sh" - DESTINATION "${destination}") endfunction() -- cgit v1.2.3