CMake: remove the pointer_32bit and pointer_64bit tests

x32 is no longer relevant, the architecture checks suffice instead.

Drive-by break the very, very long lines.

Change-Id: Ifbf974a4d10745b099b1fffd17775c10e5b05284
Reviewed-by: Alexandru Croitor <[email protected]>

1 files changed, 9 insertions, 36 deletions

diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake
index 654fc2ec9d..76e949b626 100644
--- a/src/qml/configure.cmake
+++ b/src/qml/configure.cmake
@@ -19,40 +19,6 @@ endif()
 
 #### Tests
 
-# pointer_32bit
-qt_config_compile_test(pointer_32bit
-    LABEL "32bit pointers"
-    CODE
-"
-
-
-int main(int argc, char **argv)
-{
-    (void)argc; (void)argv;
-    /* BEGIN TEST: */
-static_assert(sizeof(void *) == 4, \"fail\");
-    /* END TEST: */
-    return 0;
-}
-")
-
-# pointer_64bit
-qt_config_compile_test(pointer_64bit
-    LABEL "64bit pointers"
-    CODE
-"
-
-
-int main(int argc, char **argv)
-{
-    (void)argc; (void)argv;
-    /* BEGIN TEST: */
-static_assert(sizeof(void *) == 8, \"fail\");
-    /* END TEST: */
-    return 0;
-}
-")
-
 # arm_thumb
 qt_config_compile_test(arm_thumb
     LABEL "THUMB mode on ARM"
@@ -111,13 +77,20 @@ qt_feature("qml-network" PUBLIC
     PURPOSE "Provides network transparency."
     CONDITION QT_FEATURE_network
 )
-# On arm and arm64 we need a specialization of cacheFlush() for each OS to be enabeled. Therefore the config white list. Also Mind that e.g. x86_32 has arch.x86_64 but 32bit pointers. Therefore the checks for architecture and pointer size. Finally, ios and tvos can technically use the JIT but Apple does not allow it. Therefore, it's disabled by default.
+
+# On arm and arm64 we need a specialization of cacheFlush() for each OS to be
+# enabled. Therefore the config white list. Finally, ios and tvos can
+# technically use the JIT but Apple does not allow it. Therefore, it's disabled
+# by default.
 qt_feature("qml-jit" PRIVATE
     SECTION "QML"
     LABEL "QML just-in-time compiler"
     PURPOSE "Provides a JIT for QML and JavaScript"
     AUTODETECT NOT IOS AND NOT TVOS
-    CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
+    CONDITION ( ( TEST_architecture_arch STREQUAL i386 AND QT_FEATURE_sse2 ) OR
+        ( TEST_architecture_arch STREQUAL x86_64 AND QT_FEATURE_sse2 ) OR
+        ( TEST_architecture_arch STREQUAL arm AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR
+        ( TEST_architecture_arch STREQUAL arm64 AND TEST_arm_fp AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
 )
 # special case begin
 # When doing macOS universal builds, JIT needs to be disabled for the ARM slice.