Regenerate qtbase after wip/qt6 -> wip/cmake merge

Note that android builds will be broken after this merge and
regeneration, because we don't currently handle the minimum required
changes that were brought in with the Android multi ABI support
that comes from 5.14.

This will have to be addressed in a separate change.
For now the build on Android will fail while compiling due to incorrect
generation of LIB_SUFFIX with QT_ARCH.

Change-Id: Ia4a871f4b7ddd0da11caf5f34e10a599a97bb55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

3 files changed, 187 insertions, 127 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 7789302ae9..341f18bb9b 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -22,7 +22,6 @@ add_qt_module(Gui
         image/qimagewriter.cpp image/qimagewriter.h
         image/qpaintengine_pic.cpp image/qpaintengine_pic_p.h
         image/qpicture.cpp image/qpicture.h image/qpicture_p.h
-        image/qpictureformatplugin.cpp image/qpictureformatplugin.h
         image/qpixmap.cpp image/qpixmap.h
         image/qpixmap_blitter.cpp image/qpixmap_blitter_p.h
         image/qpixmap_raster.cpp image/qpixmap_raster_p.h
@@ -249,61 +248,11 @@ add_qt_resource(Gui "qmake_webgradients"
     PREFIX
         "qgradient"
     BASE
-        "['painting']"
+        "painting"
     FILES
         ${qmake_webgradients_resource_files}
 )
 
-add_qt_simd_part(Gui SIMD sse2
-    SOURCES
-        painting/qdrawhelper_sse2.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD ssse3
-    SOURCES
-        image/qimage_ssse3.cpp
-        painting/qdrawhelper_ssse3.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD sse4_1
-    SOURCES
-        painting/qdrawhelper_sse4.cpp
-        painting/qimagescale_sse4.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD neon
-    SOURCES
-        image/qimage_neon.cpp
-        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
-        painting/qimagescale_neon.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dsp
-    SOURCES
-        painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
-        painting/qdrawhelper_mips_dsp_asm.S
-        painting/qt_mips_asm_dsp_p.h
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dspr2
-    SOURCES
-        image/qimage_mips_dspr2.cpp
-        image/qimage_mips_dspr2_asm.S
-        painting/qdrawhelper_mips_dspr2_asm.S
-)
-
-
-add_qt_simd_part(Gui SIMD arch_haswell
-    SOURCES
-        painting/qdrawhelper_avx2.cpp
-)
-
-
 
 #### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
 # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist"
@@ -477,6 +426,69 @@ extend_target(Gui CONDITION QT_FEATURE_png
         PNG::PNG
 )
 
+if(NOT ANDROID)
+    add_qt_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dsp
+        SOURCES
+            painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
+            painting/qdrawhelper_mips_dsp_asm.S
+            painting/qt_mips_asm_dsp_p.h
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    add_qt_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND arm64-v8a
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+extend_target(Gui CONDITION ANDROID AND (x86 OR x86_64)
+    SOURCES
+        image/qimage_ssse3.cpp
+        painting/qdrawhelper_sse2.cpp
+        painting/qdrawhelper_ssse3.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE2
+        QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSE3
+        QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3
+)
+
 extend_target(Gui CONDITION QT_FEATURE_harfbuzz
     SOURCES
         text/qharfbuzzng.cpp text/qharfbuzzng_p.h
@@ -520,13 +532,27 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
 )
 
-#### Keys ignored in scope 50:.:painting:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND NOT INTEGRITY AND NOT QT_ARCH___contains___arm64:
-# NEON_ASM = "../3rdparty/pixman/pixman-arm-neon-asm.S" "painting/qdrawhelper_neon_asm.S"
+if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
 
 extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
@@ -582,7 +608,7 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 68:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 78:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
 # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
 # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@@ -598,10 +624,10 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 69:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 70:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 extend_target(Gui CONDITION WASM
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b8b24083c7..c7645e9105 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -65,7 +65,6 @@ add_qt_module(Gui
         image/qimagewriter.cpp image/qimagewriter.h
         image/qpaintengine_pic.cpp image/qpaintengine_pic_p.h
         image/qpicture.cpp image/qpicture.h image/qpicture_p.h
-        image/qpictureformatplugin.cpp image/qpictureformatplugin.h
         image/qpixmap.cpp image/qpixmap.h
         image/qpixmap_blitter.cpp image/qpixmap_blitter_p.h
         image/qpixmap_raster.cpp image/qpixmap_raster_p.h
@@ -295,53 +294,12 @@ set(qmake_webgradients_resource_files
 add_qt_resource(Gui "qmake_webgradients"
     PREFIX
         "/qgradient/" # special case
+    #BASE # special case remove
+        #"painting" # special case remove
     FILES
         ${qmake_webgradients_resource_files}
 )
 
-add_qt_simd_part(Gui SIMD sse2
-    SOURCES
-        painting/qdrawhelper_sse2.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD ssse3
-    SOURCES
-        image/qimage_ssse3.cpp
-        painting/qdrawhelper_ssse3.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD sse4_1
-    SOURCES
-        painting/qdrawhelper_sse4.cpp
-        painting/qimagescale_sse4.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD neon
-    SOURCES
-        image/qimage_neon.cpp
-        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
-        painting/qimagescale_neon.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dsp
-    SOURCES
-        painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
-        painting/qdrawhelper_mips_dsp_asm.S
-        painting/qt_mips_asm_dsp_p.h
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dspr2
-    SOURCES
-        image/qimage_mips_dspr2.cpp
-        image/qimage_mips_dspr2_asm.S
-        painting/qdrawhelper_mips_dspr2_asm.S
-)
-
 # special case begin
 # Replace arch_haswell with avx2 feature. That is what is used in the code requireing
 # this file, too!
@@ -359,7 +317,6 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
 # special case end
 
 
-
 #### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
 # MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations"
 # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist"
@@ -551,6 +508,69 @@ extend_target(Gui CONDITION QT_FEATURE_png
         PNG::PNG
 )
 
+if(NOT ANDROID)
+    add_qt_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dsp
+        SOURCES
+            painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
+            painting/qdrawhelper_mips_dsp_asm.S
+            painting/qt_mips_asm_dsp_p.h
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    add_qt_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND arm64-v8a
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+extend_target(Gui CONDITION ANDROID AND (x86 OR x86_64)
+    SOURCES
+        image/qimage_ssse3.cpp
+        painting/qdrawhelper_sse2.cpp
+        painting/qdrawhelper_ssse3.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE2
+        QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSE3
+        QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3
+)
+
 # special case begin
 if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0)
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86048
@@ -603,11 +623,28 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
     DEFINES
         ENABLE_PIXMAN_DRAWHELPERS
 )
 
+if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
+
 # special case begin
 extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64" AND QT_FEATURE_neon)
     SOURCES
@@ -616,9 +653,6 @@ extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (
 )
 # special case end
 
-#### Keys ignored in scope 51:.:painting:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND NOT INTEGRITY AND NOT QT_ARCH___contains___arm64:
-# NEON_ASM = "../3rdparty/pixman/pixman-arm-neon-asm.S" "painting/qdrawhelper_neon_asm.S"
-
 extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
         util/qshadergenerator.cpp util/qshadergenerator_p.h
@@ -729,10 +763,10 @@ endif()
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 69:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 70:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 extend_target(Gui CONDITION WASM
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index d01a3fdfa6..2f8c7cecb0 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -18,10 +18,6 @@ set_property(CACHE INPUT_libmd4c PROPERTY STRINGS undefined no qt system)
 set(INPUT_libpng "undefined" CACHE STRING "")
 set_property(CACHE INPUT_libpng PROPERTY STRINGS undefined no qt system)
 
-# input xcb
-set(INPUT_xcb "undefined" CACHE STRING "")
-set_property(CACHE INPUT_xcb PROPERTY STRINGS undefined no yes qt system)
-
 
 
 #### Libraries
@@ -438,7 +434,8 @@ glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
 # xcb_syslibs
 qt_config_compile_test(xcb_syslibs
     LABEL "XCB (extensions)"
-"
+"// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
+#define explicit dont_use_cxx_explicit
 #include <xcb/xcb.h>
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_keysyms.h>
@@ -451,7 +448,8 @@ qt_config_compile_test(xcb_syslibs
 #include <xcb/xinerama.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_renderutil.h>
-
+#include <xcb/xkb.h>
+#undef explicit
 int main(int argc, char **argv)
 {
     (void)argc; (void)argv;
@@ -466,10 +464,12 @@ xcb_render_query_pict_formats_reply_t *formatsReply =
     xcb_render_query_pict_formats_reply(c, formatsCookie, &error);
 /* RENDERUTIL: xcb_renderutil.h include won't compile unless version >= 0.3.9 */
 xcb_render_util_find_standard_format(nullptr, XCB_PICT_STANDARD_ARGB_32);
+/* XKB: This takes more arguments in xcb-xkb < 1.11 */
+xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);
     /* END TEST: */
     return 0;
 }
-"# FIXME: use: xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb
+"# FIXME: use: xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb
 )
 
 
@@ -679,7 +679,7 @@ qt_feature("openvg" PUBLIC
 )
 qt_feature("egl" PUBLIC PRIVATE
     LABEL "EGL"
-    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND )
+    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND ) AND ( QT_FEATURE_dlopen OR NOT UNIX )
 )
 qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1")
 qt_feature("egl_x11" PRIVATE
@@ -771,8 +771,7 @@ qt_feature("xcb" PRIVATE
     SECTION "Platform plugins"
     LABEL "XCB"
     AUTODETECT NOT APPLE
-    CONDITION QT_FEATURE_thread AND QT_FEATURE_xkbcommon AND TARGET XCB::XCB
-    ENABLE INPUT_xcb STREQUAL 'system' OR INPUT_xcb STREQUAL 'qt' OR INPUT_xcb STREQUAL 'yes'
+    CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11
 )
 qt_feature("xcb_glx_plugin" PRIVATE
     LABEL "GLX Plugin"
@@ -800,11 +799,6 @@ qt_feature("xrender" PRIVATE
     CONDITION QT_FEATURE_xcb_native_painting
     EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_native_painting
 )
-qt_feature("xkb" PRIVATE
-    LABEL "XCB XKB"
-    CONDITION ( NOT ON OR XCB_XKB_FOUND ) AND XKB_FOUND
-    EMIT_IF QT_FEATURE_xcb
-)
 qt_feature("xcb_xlib" PRIVATE
     LABEL "XCB Xlib"
     CONDITION QT_FEATURE_xlib AND X11_XCB_FOUND
@@ -814,15 +808,21 @@ qt_feature("xcb_sm" PRIVATE
     CONDITION QT_FEATURE_sessionmanager AND X11_SM_FOUND
     EMIT_IF QT_FEATURE_xcb
 )
-qt_feature("xcb_xinput" PRIVATE
-    LABEL "XCB XInput"
-    CONDITION NOT ON OR XCB_XINPUT_FOUND
+qt_feature("system_xcb_xinput" PRIVATE
+    LABEL "Using system-provided xcb-xinput"
+    CONDITION XCB_XINPUT_FOUND
+    ENABLE INPUT_bundled_xcb_xinput STREQUAL 'no'
+    DISABLE INPUT_bundled_xcb_xinput STREQUAL 'yes'
     EMIT_IF QT_FEATURE_xcb
 )
 qt_feature("xkbcommon" PRIVATE
     LABEL "xkbcommon"
     CONDITION XKB_FOUND
 )
+qt_feature("xkbcommon_x11" PRIVATE
+    LABEL "xkbcommon-x11"
+    CONDITION QT_FEATURE_xkbcommon AND XKB_FOUND
+)
 qt_feature("xlib" PRIVATE
     LABEL "XLib"
     AUTODETECT NOT APPLE OR QT_FEATURE_xcb