diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-18 13:29:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-18 15:45:16 +0000 |
| commit | bbb2fe3c2805cb8a6a17e095e3f287c505110222 (patch) | |
| tree | 6eb36243e37531e3015725aa6f8fafb0d5212fbb /cmake | |
| parent | 9b8b1fe6d17d687697e3b4e6982fac959f7c8869 (diff) | |
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 <heikki.halmet@qt.io>
(cherry picked from commit bcbdbd50fefd90cc8cfe2c01d8f681dfe690971a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtWrapperScriptHelpers.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
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() |