diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-12-10 16:01:55 +0200 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-12-16 19:45:08 +0200 |
| commit | 4aea86f5e8f4533a2a7ca9d7c21da8f81118c631 (patch) | |
| tree | 5a5399156626eab2c85889ef9c3b08c1293bdee9 /tests/auto/corelib/text/qbytearray | |
| parent | 387797e9238c987637acc81baa32b95f9a9d6b12 (diff) | |
Fix autotest runtime failures on INTEGRITY
- add test resources to binaries
- link Qt::Gui to tst_qpointer for static build case
Task-number: QTBUG-99123
Pick-to: 6.2 6.3
Change-Id: I311827b9c641eaf9537091b051c15f9fcbcb9f0c
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/text/qbytearray')
| -rw-r--r-- | tests/auto/corelib/text/qbytearray/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/text/qbytearray/testdata.qrc (renamed from tests/auto/corelib/text/qbytearray/android_testdata.qrc) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt index 57f73f6672..36bbef19a5 100644 --- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt @@ -25,16 +25,16 @@ qt_internal_extend_target(tst_qbytearray CONDITION APPLE ${FWFoundation} ) -if(ANDROID) +if(ANDROID OR INTEGRITY) # Resources: - set(android_testdata_resource_files + set(testdata_resource_files "rfc3252.txt" ) - qt_internal_add_resource(tst_qbytearray "android_testdata" + qt_internal_add_resource(tst_qbytearray "testdata" PREFIX "/" FILES - ${android_testdata_resource_files} + ${testdata_resource_files} ) endif() diff --git a/tests/auto/corelib/text/qbytearray/android_testdata.qrc b/tests/auto/corelib/text/qbytearray/testdata.qrc index 5d42f0f627..5d42f0f627 100644 --- a/tests/auto/corelib/text/qbytearray/android_testdata.qrc +++ b/tests/auto/corelib/text/qbytearray/testdata.qrc |