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 /util | |
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 'util')
-rwxr-xr-x | util/android/android_cmakelist_patcher.sh | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/util/android/android_cmakelist_patcher.sh b/util/android/android_cmakelist_patcher.sh deleted file mode 100755 index 36888d8825..0000000000 --- a/util/android/android_cmakelist_patcher.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -############################################################################# -## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the plugins of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# -# This util patches CMakeLists.txt files to enable running -# autotest in Android emulator in Qt CI. - -tests_dir="$PWD/tests/auto" -find ${tests_dir} -iname "CMakeLists.txt" -print0 | - while IFS= read -r -d '' file; do - sed -i '/qt_internal_add_test/a\ PUBLIC_LIBRARIES\n Qt::Gui' $file - done |