qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtbase/tests/shared/androidutils.h

19 lines
350 B
C
Raw Normal View History

Android: auto-tests: Add missing lib to tst_qapplication Android apk tst_qapplication is missing the modal_helper executable from the apk. Set the libmodal_helper.so as a target property for the tst_qapplication with QT_ANDROID_EXTRA_LIBS property. Change the name of qtbug_12673() test function to modalDialog(), I think this better represents what's being tested. The bug ticket representing qtbug_12673() can be found from the ticket linked to this commit. Construct a full path to the modal_helper.so and pass that to QProcess.start instead of relative path to filename when targeting Android. Add a shared utility function androidAbi() that returns the currently defined Android ABI. Change the function name in BLACKLIST file. Task-number: QTQAINFRA-6908 Pick-to: 6.8 6.9 6.10 Change-Id: I13904acda0f5608ea31df49bd95824e1412f2786 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-06-11 06:53:03 +00:00
// Copyright (C) 2025 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QString>
inline QString androidAbi()
{
#if defined(__aarch64__)
return "arm64-v8a";
#elif defined(__arm__)
return "armeabi-v7a";
#elif defined(__i386__)
return "x86";
#elif defined(__x86_64__)
return "x86_64";
#endif
}