From 4aea86f5e8f4533a2a7ca9d7c21da8f81118c631 Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Fri, 10 Dec 2021 16:01:55 +0200
Subject: [PATCH] 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>
---
 .../corelib/kernel/qmetatype/CMakeLists.txt     | 14 ++++++++++++++
 .../auto/corelib/kernel/qmetatype/testdata.qrc  |  5 +++++
 .../auto/corelib/kernel/qpointer/CMakeLists.txt |  2 ++
 .../serialization/qdatastream/CMakeLists.txt    |  2 +-
 .../auto/corelib/text/qbytearray/CMakeLists.txt |  8 ++++----
 .../{android_testdata.qrc => testdata.qrc}      |  0
 tests/auto/corelib/text/qchar/CMakeLists.txt    |  2 +-
 .../text/qstringconverter/CMakeLists.txt        | 17 +++++++++++++++++
 .../corelib/text/qstringconverter/testdata.qrc  |  5 +++++
 .../tools/qcryptographichash/CMakeLists.txt     |  2 +-
 10 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 tests/auto/corelib/kernel/qmetatype/testdata.qrc
 rename tests/auto/corelib/text/qbytearray/{android_testdata.qrc => testdata.qrc} (100%)
 create mode 100644 tests/auto/corelib/text/qstringconverter/testdata.qrc

diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
index 195dd81059f..ac4fb558135 100644
--- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -21,6 +21,20 @@ qt_internal_add_test(tst_qmetatype
     TESTDATA ${test_data}
 )
 
+if(INTEGRITY)
+    # Resources:
+    set(testdata_resource_files
+        "typeFlags.bin"
+    )
+
+    qt_internal_add_resource(tst_qmetatype "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
+
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/corelib/kernel/qmetatype/testdata.qrc b/tests/auto/corelib/kernel/qmetatype/testdata.qrc
new file mode 100644
index 00000000000..d3956e40685
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetatype/testdata.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>typeFlags.bin</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
index cfafc1eb110..55a5e50ee7a 100644
--- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
@@ -7,6 +7,8 @@
 qt_internal_add_test(tst_qpointer
     SOURCES
         tst_qpointer.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
 )
 
 ## Scopes:
diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
index 5795ad3ed36..136ff4ee19f 100644
--- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
@@ -18,7 +18,7 @@ qt_internal_add_test(tst_qdatastream
 ## Scopes:
 #####################################################################
 
-if(ANDROID)
+if(ANDROID OR INTEGRITY)
     # Resources:
     set(testdata_resource_files
         "datastream.q42"
diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt
index 57f73f6672e..36bbef19a53 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
similarity index 100%
rename from tests/auto/corelib/text/qbytearray/android_testdata.qrc
rename to tests/auto/corelib/text/qbytearray/testdata.qrc
diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt
index 3cfc31172d5..06faffb60ed 100644
--- a/tests/auto/corelib/text/qchar/CMakeLists.txt
+++ b/tests/auto/corelib/text/qchar/CMakeLists.txt
@@ -18,7 +18,7 @@ qt_internal_add_test(tst_qchar
 ## Scopes:
 #####################################################################
 
-if(ANDROID)
+if(ANDROID OR INTEGRITY)
     # Resources:
     set(testdata_resource_files
         "data/NormalizationTest.txt"
diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
index 5b5eee953e0..f64aaaf8d23 100644
--- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
+++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt
@@ -4,7 +4,24 @@
 ## tst_qstringconverter Test:
 #####################################################################
 
+list(APPEND test_data "utf8.txt")
+
 qt_internal_add_test(tst_qstringconverter
     SOURCES
         tst_qstringconverter.cpp
+    TESTDATA ${test_data}
 )
+
+if(INTEGRITY)
+    # Resources:
+    set(testdata_resource_files
+        "utf8.txt"
+    )
+
+    qt_internal_add_resource(tst_qstringconverter "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/text/qstringconverter/testdata.qrc b/tests/auto/corelib/text/qstringconverter/testdata.qrc
new file mode 100644
index 00000000000..fe95cdf90d2
--- /dev/null
+++ b/tests/auto/corelib/text/qstringconverter/testdata.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>utf8.txt</file>
+    </qresource>
+</RCC>
diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
index d8de1798f39..cea74758ccd 100644
--- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_internal_add_test(tst_qcryptographichash
 ## Scopes:
 #####################################################################
 
-if(ANDROID)
+if(ANDROID OR INTEGRITY)
     # Resources:
     set(testdata_resource_files
         "data/2c1517dad3678f03917f15849b052fd5.md5"